| Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
| index a988d5f1909a43bcc7fd132df472c53b377d6755..a38c1dbef256d548ca4a77a2cc947c8cabf72989 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
| @@ -431,7 +431,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
|
|
|
| @Override
|
| public void onDidStartNavigation(Tab tab, String url, boolean isInMainFrame,
|
| - boolean isSamePage, boolean isErrorPage) {
|
| + boolean isSameDocument, boolean isErrorPage) {
|
| if (!isInMainFrame) return;
|
| // Update URL as soon as it becomes available when it's a new tab.
|
| // But we want to update only when it's a new tab. So we check whether the current
|
| @@ -443,7 +443,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
|
| mLocationBar.setUrlToPageUrl();
|
| }
|
|
|
| - if (isSamePage) return;
|
| + if (isSameDocument) return;
|
| // This event is used as the primary trigger for the progress bar because it
|
| // is the earliest indication that a load has started for a particular frame. In
|
| // the case of the progress bar, it should only traverse the screen a single time
|
| @@ -462,10 +462,10 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
|
|
|
| @Override
|
| public void onDidFinishNavigation(Tab tab, String url, boolean isInMainFrame,
|
| - boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
|
| + boolean isErrorPage, boolean hasCommitted, boolean isSameDocument,
|
| boolean isFragmentNavigation, Integer pageTransition, int errorCode,
|
| int httpStatusCode) {
|
| - if (hasCommitted && isInMainFrame && !isSamePage) {
|
| + if (hasCommitted && isInMainFrame && !isSameDocument) {
|
| mToolbar.onNavigatedToDifferentPage();
|
| }
|
|
|
|
|