Use VrTabHelper to disable popups

chrome/browser/android/tab_web_contents_delegate_android.cc

Index: chrome/browser/android/tab_web_contents_delegate_android.cc
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
index fa26ef6cfad50bcdd5315f2e88982dc4be8703f2..ded1ed1cf179292b8ccf93dfec69ebe73e617a0d 100644
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/android/banners/app_banner_manager_android.h"
 #include "chrome/browser/android/feature_utilities.h"
 #include "chrome/browser/android/hung_renderer_infobar_delegate.h"
+#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ -119,6 +120,12 @@ void TabWebContentsDelegateAndroid::LoadingStateChanged(
 void TabWebContentsDelegateAndroid::RunFileChooser(
     content::RenderFrameHost* render_frame_host,
     const FileChooserParams& params) {
+  vr_shell::VrTabHelper* vr_tab_helper = vr_shell::VrTabHelper::FromWebContents(
+      WebContents::FromRenderFrameHost(render_frame_host));
+  DCHECK(vr_tab_helper);
+  if (vr_tab_helper->HandleFileChooser())
+    return;
+
   FileSelectHelper::RunFileChooser(render_frame_host, params);
 }
 
@@ -126,6 +133,12 @@ std::unique_ptr<BluetoothChooser>
 TabWebContentsDelegateAndroid::RunBluetoothChooser(
     content::RenderFrameHost* frame,
     const BluetoothChooser::EventHandler& event_handler) {
+  vr_shell::VrTabHelper* vr_tab_helper = vr_shell::VrTabHelper::FromWebContents(
+      WebContents::FromRenderFrameHost(frame));
+  DCHECK(vr_tab_helper);
+  if (vr_tab_helper->HandleBluetoothChooser())
+    return nullptr;
+
   return base::MakeUnique<BluetoothChooserAndroid>(frame, event_handler);
 }
 
@@ -255,6 +268,11 @@ void TabWebContentsDelegateAndroid::FindMatchRectsReply(
 content::JavaScriptDialogManager*
 TabWebContentsDelegateAndroid::GetJavaScriptDialogManager(
     WebContents* source) {
+  vr_shell::VrTabHelper* vr_tab_helper =
+      vr_shell::VrTabHelper::FromWebContents(source);
+  DCHECK(vr_tab_helper);
+  if (vr_tab_helper->HandleJavaScriptDialog())
+    return nullptr;
   return app_modal::JavaScriptDialogManager::GetInstance();
 }
 
@@ -262,6 +280,12 @@ void TabWebContentsDelegateAndroid::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
+  vr_shell::VrTabHelper* vr_tab_helper =
+      vr_shell::VrTabHelper::FromWebContents(web_contents);
+  DCHECK(vr_tab_helper);
+  if (vr_tab_helper->HandleMediaPermission())
+    return;
+
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
       web_contents, request, callback, nullptr);
 }