From 1461244018a225006a8d4c203f9dfe294ffe94fa Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Fri, 24 Jun 2011 13:06:29 -0700
Subject: Preloading support in browser

	   Apps like the QSB can request the browser to preload a
	   web page.
           - preloaded pages are not added to the browser history
	     if they'r not seen by the user
	   - when a request is received, a new tab is created for the
	     preloaded page, but not added to the tab list
 	   - upon receiving the view intent for the preloaded page
             the tab is added to the tab list, and shown
	   - if several pages are preloaded consecutively in the same tab,
             the back stack is cleared before it is displayed
           - preloaded pages use the main browser cookie jar, so pages that
             have never been viewed by the user can drop cookies

Change-Id: I9ed21f2c9560fda0ed042b460b73bb33988a2e8a
---
 src/com/android/browser/XLargeUi.java | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 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 8b43a7486..8455e743d 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -69,6 +69,14 @@ public class XLargeUi extends BaseUi implements ScrollListener {
         mActionBar.setCustomView(mTabBar);
     }
 
+    @Override
+    public void onSetWebView(Tab tab, WebView v) {
+        super.onSetWebView(tab, v);
+        if (v != null) {
+            ((BrowserWebView) v).setScrollListener(this);
+        }
+    }
+
     @Override
     public void showComboView(boolean startWithHistory, Bundle extras) {
         super.showComboView(startWithHistory, extras);
@@ -135,21 +143,6 @@ public class XLargeUi extends BaseUi implements ScrollListener {
         hideTitleBar();
     }
 
-    // webview factory
-
-    @Override
-    public WebView createWebView(boolean privateBrowsing) {
-        // Create a new WebView
-        BrowserWebView w = (BrowserWebView) super.createWebView(privateBrowsing);
-        w.setScrollListener(this);
-        return w;
-    }
-
-    @Override
-    public WebView createSubWebView(boolean privateBrowsing) {
-        return super.createWebView(privateBrowsing);
-    }
-
     @Override
     public void onScroll(int visibleTitleHeight, boolean userInitiated) {
         mTabBar.onScroll(visibleTitleHeight, userInitiated);
-- 
cgit v1.2.3