Revert "Support for measuring page load times."
The page load time measurement was a stop gap measure until server side
support is ready, and we don't want to ship with it in.
Bug: 5266893
This reverts commit b4e831bf1ff62945199b89a77ad039be7bd16545.
Change-Id: Iafc08cea88774e5ecf018112a25e4dc2993a4623
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 4809f13..3533bf1 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -18,7 +18,6 @@
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.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.regex.Pattern;
/**
* Controller for browser
@@ -769,7 +767,6 @@
public void stopLoading() {
mLoadStopped = true;
Tab tab = mTabControl.getCurrentTab();
- tab.clearPageLoadCompleteListener();
WebView w = getCurrentTopWebView();
w.stopLoading();
mUi.onPageStopped(tab);
@@ -2167,8 +2164,7 @@
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 @@
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 @@
// 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