1 files changed, 1 insertions, 33 deletions

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 4809f13c6..3533bf1d9 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -18,7 +18,6 @@ package com.android.browser;
 
 import android.app.Activity;
 import android.app.DownloadManager;
-import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
 import android.content.ContentProvider;
@@ -93,7 +92,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * Controller for browser
@@ -769,7 +767,6 @@ public class Controller
     public void stopLoading() {
         mLoadStopped = true;
         Tab tab = mTabControl.getCurrentTab();
-        tab.clearPageLoadCompleteListener();
         WebView w = getCurrentTopWebView();
         w.stopLoading();
         mUi.onPageStopped(tab);
@@ -2167,8 +2164,7 @@ public class Controller
         final PreloadedTabControl tabControl = urlData.getPreloadedTab();
         final String sbQuery = urlData.getSearchBoxQueryToSubmit();
         if (sbQuery != null) {
-            if (!tabControl.searchBoxSubmit(sbQuery, urlData.mUrl, urlData.mHeaders,
-                    urlData.getOnLoadCompletePendingIntent())) {
+            if (!tabControl.searchBoxSubmit(sbQuery, urlData.mUrl, urlData.mHeaders)) {
                 // Could not submit query. Fallback to regular tab creation
                 tabControl.destroy();
                 return null;
@@ -2186,18 +2182,6 @@ public class Controller
         mTabControl.addPreloadedTab(t);
         addTab(t);
         setActiveTab(t);
-        if (sbQuery == null) {
-            // if the searchbox query is set, the load complete notification is handled within
-            // the preloaded tab controller.
-            if (t.inPageLoad()) {
-                requestLoadCompleteNotification(urlData.mOnLoadCompletePendingIntent, t,
-                        urlData.mUrl, true, true);
-            } else {
-                // the page is already fully loaded
-                IntentHandler.sendPageLoadCompletePendingIntent(mActivity,
-                        urlData.mOnLoadCompletePendingIntent, true, true);
-            }
-        }
         return t;
     }
 
@@ -2391,26 +2375,10 @@ public class Controller
                 // this isn't called for preloaded tabs
             } else {
                 loadUrl(t, data.mUrl, data.mHeaders);
-                requestLoadCompleteNotification(data.mOnLoadCompletePendingIntent, t, data.mUrl,
-                        null, null);
             }
         }
     }
 
-    private void requestLoadCompleteNotification(final PendingIntent loadCompletePendingIntent,
-            Tab t, String forUrl, final Boolean preloaded, final Boolean preloadSuccess) {
-        if (loadCompletePendingIntent != null) {
-            Pattern urlMatch = Pattern.compile(Pattern.quote(forUrl));
-            t.setOnPageLoadCompleteListener(urlMatch, new Tab.OnPageLoadCompleteListener() {
-                @Override
-                public void onPageLoadComplete() {
-                    IntentHandler.sendPageLoadCompletePendingIntent(mActivity,
-                            loadCompletePendingIntent, preloaded, preloadSuccess);
-                }
-            });
-        }
-    }
-
     @Override
     public void onUserCanceledSsl(Tab tab) {
         // TODO: Figure out the "right" behavior