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

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

Issue 2975593002: [vr] Deny permission requests in VR mode
Patch Set: . Created 3 years, 5 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
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 fd602959400e0e4e322236f8768677d7dcc4bc31..478c2ed039fffb8df37e76bfc703e96b46464924 100644
--- a/chrome/browser/android/vr_shell/vr_shell.cc
+++ b/chrome/browser/android/vr_shell/vr_shell.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/android/vr_shell/vr_input_manager.h"
#include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
#include "chrome/browser/android/vr_shell/vr_shell_gl.h"
-#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
#include "chrome/browser/android/vr_shell/vr_usage_monitor.h"
#include "chrome/browser/android/vr_shell/vr_web_contents_observer.h"
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
@@ -35,6 +34,7 @@
#include "chrome/browser/vr/toolbar_helper.h"
#include "chrome/browser/vr/ui_interface.h"
#include "chrome/browser/vr/ui_scene_manager.h"
+#include "chrome/browser/vr/vr_tab_helper.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_controller.h"
@@ -84,7 +84,7 @@ void SetIsInVR(content::WebContents* contents, bool is_in_vr) {
// VrTabHelper for details).
contents->GetRenderWidgetHostView()->SetIsInVR(is_in_vr);
- VrTabHelper* vr_tab_helper = VrTabHelper::FromWebContents(contents);
+ vr::VrTabHelper* vr_tab_helper = vr::VrTabHelper::FromWebContents(contents);
DCHECK(vr_tab_helper);
vr_tab_helper->SetIsInVr(is_in_vr);
}
« no previous file with comments | « chrome/browser/android/tab_web_contents_delegate_android.cc ('k') | chrome/browser/android/vr_shell/vr_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698