From 4d2fcaba7fb8eb1723943ac9a10e76d509330bd1 Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <joth@google.com>
Date: Fri, 24 Feb 2012 00:13:06 +0000
Subject: Fixup browser to use WebView proxy

Has to escape out to WebViewClassic whenever it needs a hidden API.

Interdepends on https://android-git.corp.google.com/g/165608

Change-Id: Ic61dd7f57f75381864075605d5901f2688648cbd
---
 src/com/android/browser/XLargeUi.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/com/android/browser/XLargeUi.java')

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 31430250a..46149aace 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -36,6 +36,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebView;
+import android.webkit.WebViewClassic;
 
 import java.util.List;
 
@@ -93,7 +94,7 @@ public class XLargeUi extends BaseUi {
             mPieControl.attachToContainer(mContentView);
             WebView web = getWebView();
             if (web != null) {
-                web.setEmbeddedTitleBar(null);
+                WebViewClassic.fromWebView(web).setEmbeddedTitleBar(null);
 
             }
         } else {
@@ -107,7 +108,7 @@ public class XLargeUi extends BaseUi {
                     ViewGroup p = (ViewGroup) mTitleBar.getParent();
                     p.removeView(mTitleBar);
                 }
-                web.setEmbeddedTitleBar(mTitleBar);
+                WebViewClassic.fromWebView(web).setEmbeddedTitleBar(mTitleBar);
             }
             setTitleGravity(Gravity.NO_GRAVITY);
         }
@@ -144,7 +145,7 @@ public class XLargeUi extends BaseUi {
     void stopWebViewScrolling() {
         BrowserWebView web = (BrowserWebView) mUiController.getCurrentWebView();
         if (web != null) {
-            web.stopScroll();
+            WebViewClassic.fromWebView(web).stopScroll();
         }
     }
 
@@ -202,7 +203,7 @@ public class XLargeUi extends BaseUi {
         } else {
             // check if title bar is already attached by animation
             if (mTitleBar.getParent() == null) {
-                view.setEmbeddedTitleBar(mTitleBar);
+                WebViewClassic.fromWebView(view).setEmbeddedTitleBar(mTitleBar);
             }
         }
         mTabBar.onSetActiveTab(tab);
-- 
cgit v1.2.3