Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
index 7f233424c2afc89b6c132a8976506f041b36f0e8..3b09379c9dede755ef1e4a1e13e492e2c03bb4df 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
@@ -1751,25 +1751,14 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener, |
} |
/** |
- * Notify observers when provisional load starts. |
- * @param isMainFrame Whether the load is happening for the main frame. |
- * @param validatedUrl The validated URL that is being navigated to. |
- */ |
- void handleDidStartProvisionalLoadForFrame(boolean isMainFrame, String validatedUrl) { |
- RewindableIterator<TabObserver> observers = getTabObservers(); |
- while (observers.hasNext()) { |
- observers.next().onDidStartProvisionalLoadForFrame(this, isMainFrame, validatedUrl); |
- } |
- } |
- |
- /** |
* Update internal Tab state when provisional load gets committed. |
* @param url The URL that was loaded. |
* @param transitionType The transition type to the current URL. |
*/ |
- void handleDidCommitProvisonalLoadForFrame(String url, int transitionType) { |
+ void handleDidFinishNavigation(String url, Integer transitionType) { |
mIsNativePageCommitPending = false; |
- boolean isReload = (transitionType == PageTransition.RELOAD); |
+ boolean isReload = (transitionType != null |
+ && (transitionType & PageTransition.CORE_MASK) == PageTransition.RELOAD); |
if (!maybeShowNativePage(url, isReload)) { |
showRenderedPage(); |
} |