From f9e1705d4012706664a2bdf63a50b8a784b833dd Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <joth@google.com>
Date: Sun, 25 Aug 2013 19:35:27 -0700
Subject: De-classicify Android Browser part 2

Bug: 10427705

Allows Browser to compile even when WebViewClassic is no longer in
frameworks/base. The deleted functionality was already disabled at
runtime when using non-classic webview.

Change-Id: I21b58ec52ac059c699b49a2dd80008d9a9e6791a
---
 src/com/android/browser/BrowserWebView.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

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

diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java
index 99e05875c..3e3672c9d 100644
--- a/src/com/android/browser/BrowserWebView.java
+++ b/src/com/android/browser/BrowserWebView.java
@@ -22,9 +22,7 @@ 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 java.util.Map;
@@ -32,7 +30,7 @@ import java.util.Map;
 /**
  * Manage WebView scroll events
  */
-public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDelegate {
+public class BrowserWebView extends WebView {
 
     public interface OnScrollChangedListener {
         void onScrollChanged(int l, int t, int oldl, int oldt);
@@ -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;
@@ -109,18 +102,10 @@ public class BrowserWebView extends WebView implements WebViewClassic.TitleBarDe
         mTitleBar = title;
     }
 
-    // From TitleBarDelegate
-    @Override
     public int getTitleHeight() {
         return (mTitleBar != null) ? mTitleBar.getEmbeddedHeight() : 0;
     }
 
-    // From TitleBarDelegate
-    @Override
-    public void onSetEmbeddedTitleBar(final View title) {
-        // TODO: Remove this method; it is never invoked.
-    }
-
     public boolean hasTitleBar() {
         return (mTitleBar != null);
     }
-- 
cgit v1.2.3