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

Unified Diff: chrome/browser/android/vr_shell/vr_shell.cc

Issue 2872773002: VR: Render the current URL and security level on the URL bar. (Closed)
Patch Set: Revert the inclusion of the lock icon; will re-add when moved to UI. Created 3 years, 7 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 | « chrome/browser/android/vr_shell/vr_shell.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_shell.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc
index a726bc4f4120060b0324ee8f1cc000e5acef0ea8..c1e7abfbe538bf7aec5a199cad6713374f001f49 100644
--- a/chrome/browser/android/vr_shell/vr_shell.cc
+++ b/chrome/browser/android/vr_shell/vr_shell.cc
@@ -225,6 +225,11 @@ void VrShell::OnContentPaused(bool paused) {
delegate_provider_->device_provider()->Device()->OnFocus();
}
+void VrShell::NavigateBack() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ Java_VrShellImpl_navigateBack(env, j_vr_shell_.obj());
+}
+
void VrShell::OnTriggerEvent(JNIEnv* env, const JavaParamRef<jobject>& obj) {
gl_thread_->task_runner()->PostTask(
FROM_HERE,
@@ -420,13 +425,6 @@ void VrShell::DoUiAction(const UiAction action,
const base::DictionaryValue* arguments) {
// Actions that can be handled natively.
switch (action) {
- case HISTORY_BACK:
- if (web_contents_ && web_contents_->IsFullscreen()) {
- web_contents_->ExitFullscreen(false);
- return;
- }
- // Otherwise handle in java.
- break;
case EXIT_PRESENT:
delegate_provider_->ExitWebVRPresent();
return;
@@ -448,9 +446,6 @@ void VrShell::DoUiAction(const UiAction action,
Java_VrShellImpl_openNewTab(env, j_vr_shell_.obj(), incognito);
return;
}
- case HISTORY_BACK:
- Java_VrShellImpl_navigateBack(env, j_vr_shell_.obj());
- break;
case HISTORY_FORWARD:
Java_VrShellImpl_navigateForward(env, j_vr_shell_.obj());
break;
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698