[vr] Introduce VrTabHelper

chrome/browser/android/tab_web_contents_delegate_android.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #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 "device/vr/features/features.h"
+#if BUILDFLAG(ENABLE_VR)
+#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
+#endif  // BUILDFLAG(ENABLE_VR)
+
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/android/bluetooth_chooser_android.h"
@@ skipping 86 matching lines @@
     WebContents* source, bool to_different_document) {
   bool has_stopped = source == nullptr || !source->IsLoading();
   WebContentsDelegateAndroid::LoadingStateChanged(
       source, to_different_document);
   LoadProgressChanged(source, has_stopped ? 1 : 0);
 }
 
 void TabWebContentsDelegateAndroid::RunFileChooser(
     content::RenderFrameHost* render_frame_host,
     const FileChooserParams& params) {
+#if BUILDFLAG(ENABLE_VR)

[Ted C, 2017/05/11 22:35:05]

probably out of scope, but I wonder if we should make VrTabHelper internalize
this buildflag.

whether that is including a dummy implementation if the flag is off and having
different .cc files or if we should ifdef all the contents of each of the
functions.

I think if we see this moving throughout the codebase that might be better, but
for now this is fine.

+  if (vr_shell::VrTabHelper::IsInVr(
+          WebContents::FromRenderFrameHost(render_frame_host))) {
+    return;
+  }
+#endif
   FileSelectHelper::RunFileChooser(render_frame_host, params);
 }
 
 std::unique_ptr<BluetoothChooser>
 TabWebContentsDelegateAndroid::RunBluetoothChooser(
     content::RenderFrameHost* frame,
     const BluetoothChooser::EventHandler& event_handler) {
   return base::MakeUnique<BluetoothChooserAndroid>(frame, event_handler);
 }
 
@@ skipping 116 matching lines @@
         env, details_object, i, CreateJavaRectF(env, rects[i]));
   }
 
   Java_TabWebContentsDelegateAndroid_onFindMatchRectsAvailable(env, obj,
                                                                details_object);
 }
 
 content::JavaScriptDialogManager*
 TabWebContentsDelegateAndroid::GetJavaScriptDialogManager(
     WebContents* source) {
+#if BUILDFLAG(ENABLE_VR)
+  if (vr_shell::VrTabHelper::IsInVr(source)) {
+    return nullptr;
+  }
+#endif
   return app_modal::JavaScriptDialogManager::GetInstance();
 }
 
 void TabWebContentsDelegateAndroid::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
       web_contents, request, callback, nullptr);
 }
@@ skipping 202 matching lines @@
 void NotifyStopped(JNIEnv* env,
                    const JavaParamRef<jclass>& clazz,
                    const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   scoped_refptr<MediaStreamCaptureIndicator> indicator =
       MediaCaptureDevicesDispatcher::GetInstance()
           ->GetMediaStreamCaptureIndicator();
   indicator->NotifyStopped(web_contents);
 }