Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2612)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

Issue 2929863003: VR: Update back button state in more places. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
index cdd48b571a00a5423a9fcfeb39b7a7e7e33d33be..b45b0ca24043a26fb81e46cd5a5dcaa62ac0acac 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
@@ -95,6 +95,8 @@ public class VrShellImpl
private Tab mTab;
private ContentViewCore mContentViewCore;
private NativePage mNativePage;
+ private Boolean mCanGoBack;
+ private Boolean mCanGoForward;
private WindowAndroid mOriginalWindowAndroid;
private VrWindowAndroid mContentVrWindowAndroid;
@@ -213,6 +215,28 @@ public class VrShellImpl
if (mNativeVrShell == 0) return;
nativeOnLoadProgressChanged(mNativeVrShell, progress / 100.0);
}
+
+ @Override
+ public void onCrash(Tab tab, boolean sadTabShown) {
+ updateHistoryButtonsVisibility();
+ }
+
+ @Override
+ public void onLoadStarted(Tab tab, boolean toDifferentDocument) {
+ if (!toDifferentDocument) return;
+ updateHistoryButtonsVisibility();
+ }
+
+ @Override
+ public void onLoadStopped(Tab tab, boolean toDifferentDocument) {
+ if (!toDifferentDocument) return;
+ updateHistoryButtonsVisibility();
+ }
+
+ @Override
+ public void onUrlUpdated(Tab tab) {
+ updateHistoryButtonsVisibility();
+ }
};
mTabModelSelectorObserver = new EmptyTabModelSelectorObserver() {
@@ -295,6 +319,7 @@ public class VrShellImpl
createTabList();
mActivity.getTabModelSelector().addObserver(mTabModelSelectorObserver);
createTabModelSelectorTabObserver();
+ updateHistoryButtonsVisibility();
mPresentationView.setOnTouchListener(mTouchListener);
}
@@ -596,7 +621,14 @@ public class VrShellImpl
boolean shouldAlwaysGoBack = mActivity instanceof ChromeTabbedActivity
&& (mNativePage == null || !(mNativePage instanceof NewTabPage));
boolean canGoBack = mTab.canGoBack() || shouldAlwaysGoBack;
- nativeSetHistoryButtonsEnabled(mNativeVrShell, canGoBack, mTab.canGoForward());
+ boolean canGoForward = mTab.canGoForward();
+ if ((mCanGoBack != null && canGoBack == mCanGoBack)
+ && (mCanGoForward != null && canGoForward == mCanGoForward)) {
+ return;
+ }
+ mCanGoBack = canGoBack;
+ mCanGoForward = canGoForward;
+ nativeSetHistoryButtonsEnabled(mNativeVrShell, mCanGoBack, mCanGoForward);
}
@CalledByNative
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698