From e1d6dfca80e4627a0c7fe46e38f904179c3edab3 Mon Sep 17 00:00:00 2001 From: Jonathan Dixon Date: Mon, 17 Dec 2012 13:39:17 -0800 Subject: De-classicify Browser Removes the hard run-time dependency on WebViewClassic. (Still needs visisbility of it to build though) This is needed to enable chromium webview testing. Change-Id: I290b6b23b2eac525537ebc3ef8007d681a67a169 --- src/com/android/browser/Tab.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/com/android/browser/Tab.java') diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index b5000c2ca..e3a033373 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -1293,7 +1293,9 @@ class Tab implements PictureListener { // does a redirect after a period of time. The user could have // switched to another tab while waiting for the download to start. mMainView.setDownloadListener(mDownloadListener); - getWebViewClassic().setWebBackForwardListClient(mWebBackForwardListClient); + if (BrowserWebView.isClassic()) { + getWebViewClassic().setWebBackForwardListClient(mWebBackForwardListClient); + } TabControl tc = mWebViewController.getTabControl(); if (tc != null && tc.getOnThumbnailUpdatedListener() != null) { mMainView.setPictureListener(this); @@ -1535,6 +1537,9 @@ class Tab implements PictureListener { * @return The main WebView of this tab. */ WebViewClassic getWebViewClassic() { + if (!BrowserWebView.isClassic()) { + return null; + } return WebViewClassic.fromWebView(mMainView); } -- cgit v1.2.3