Overhaul handling tab data updates
Bug: 2127502, 3191165
Pushed some state tracking to the tab for URL, title, favicon,
and lock status. This allowed me to remove many duplicate methods
of updating that data, preventing the UI from getting out of sync
with the web view.
Change-Id: I995caa98068ad03ca37710207b5ab57bb9d801ab
diff --git a/src/com/android/browser/PageDialogsHandler.java b/src/com/android/browser/PageDialogsHandler.java
index 6843a10..2dbddf3 100644
--- a/src/com/android/browser/PageDialogsHandler.java
+++ b/src/com/android/browser/PageDialogsHandler.java
@@ -97,7 +97,7 @@
mHttpAuthenticationDialog.setCancelListener(new HttpAuthenticationDialog.CancelListener() {
public void onCancel() {
handler.cancel();
- mController.resetTitleAndRevertLockIcon(tab);
+ mController.onUpdatedLockIcon(tab);
mHttpAuthenticationDialog = null;
}
});
@@ -138,20 +138,8 @@
final WebView view = tab.getWebView();
- String url = null;
- String title = null;
-
- if (view == null) {
- url = tab.getUrl();
- title = tab.getTitle();
- } else if (view == mController.getCurrentWebView()) {
- // Use the cached title and url if this is the current WebView
- url = tab.getCurrentUrl();
- title = tab.getCurrentTitle();
- } else {
- url = view.getUrl();
- title = view.getTitle();
- }
+ String url = tab.getUrl();
+ String title = tab.getTitle();
if (url == null) {
url = "";