1 files changed, 10 insertions, 17 deletions
diff --git a/src/com/android/swe/browser/BrowserWebView.java b/src/com/android/swe/browser/BrowserWebView.java
index 99e05875..f0d3f8b8 100644
--- a/src/com/android/swe/browser/BrowserWebView.java
+++ b/src/com/android/swe/browser/BrowserWebView.java
@@ -14,25 +14,22 @@
  * the License.
  */
 
-package com.android.browser;
+package com.android.swe.browser;
 
 import android.content.Context;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebStorage;
-import android.webkit.WebStorageClassic;
-import android.webkit.WebView;
-import android.webkit.WebViewClassic;
-import android.webkit.WebViewClient;
+import org.codeaurora.swe.WebChromeClient;
+import org.codeaurora.swe.WebView;
+import org.codeaurora.swe.WebViewClient;
 
 import java.util.Map;
 
 /**
  * Manage WebView scroll events
  */
-public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDelegate {
+public class BrowserWebView extends WebView implements WebView.TitleBarDelegate {
 
     public interface OnScrollChangedListener {
         void onScrollChanged(int l, int t, int oldl, int oldt);
@@ -52,7 +49,8 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
      */
     public BrowserWebView(Context context, AttributeSet attrs, int defStyle,
             Map<String, Object> javascriptInterfaces, boolean privateBrowsing) {
-        super(context, attrs, defStyle, javascriptInterfaces, privateBrowsing);
+        super(context, attrs, defStyle, privateBrowsing);
+        this.setJavascriptInterfaces(javascriptInterfaces);
     }
 
     /**
@@ -80,11 +78,6 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
         super(context);
     }
 
-    public static boolean isClassic() {
-        // Using WebStorage for convenience of access in a static method.
-        return WebStorage.getInstance() instanceof WebStorageClassic;
-    }
-
     @Override
     public void setWebChromeClient(WebChromeClient client) {
         mWebChromeClient = client;
@@ -126,7 +119,7 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
     }
 
     @Override
-    protected void onDraw(Canvas c) {
+    public void onDraw(Canvas c) {
         super.onDraw(c);
         if (!mBackgroundRemoved && getRootView().getBackground() != null) {
             mBackgroundRemoved = true;
@@ -139,11 +132,11 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
     }
 
     public void drawContent(Canvas c) {
-        onDraw(c);
+        //super.drawContent(c);
     }
 
     @Override
-    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+    public void onScrollChanged(int l, int t, int oldl, int oldt) {
         super.onScrollChanged(l, t, oldl, oldt);
         if (mTitleBar != null) {
             mTitleBar.onScrollChanged();