Disable permissions dialog in VR

chrome/browser/permissions/permission_manager.cc

 // Copyright 2015 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/permissions/permission_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/storage/durable_storage_permission_context.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
+#include "device/vr/features/features.h"
 #include "ppapi/features/features.h"
 
+#if BUILDFLAG(ENABLE_VR)
+#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
+#endif  // BUILDFLAG(ENABLE_VR)
+
 #if BUILDFLAG(ENABLE_PLUGINS)
 #include "chrome/browser/plugins/flash_permission_context.h"
 #endif
 
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
@@ skipping 234 matching lines @@
     return kNoPendingOperation;
   }
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
 
   int request_id = pending_requests_.Add(base::MakeUnique<PendingRequest>(
       render_frame_host, permissions, callback));
 
+#if BUILDFLAG(ENABLE_VR)
+  if (vr_shell::VrTabHelper::IsInVr(web_contents)) {
+    CancelPermissionRequest(request_id);
+    return kNoPendingOperation;
+  }

[raymes, 2017/05/31 00:56:00]

nit: you can just do this before we create the PendingRequest (on line ~287) and
avoid calling CancelPermissionRequest.

if (vr_shell::VrTabHelper::IsInVr(web_contents)) {
  callback.Run(std::vector<ContentSetting>(permissions.size(),
CONTENT_SETTING_BLOCK));
  return kNoPendingOperation;
}

[asimjour1, 2017/05/31 15:06:11]

Done. I moved it to line 289 (web_contents is needed here)

+#endif  // BUILDFLAG(ENABLE_VR)
+
   const PermissionRequestID request(render_frame_host, request_id);
 
   for (size_t i = 0; i < permissions.size(); ++i) {
     const ContentSettingsType permission = permissions[i];
 
     PermissionContextBase* context = GetPermissionContext(permission);
     DCHECK(context);
     context->RequestPermission(
         web_contents, request, requesting_origin, user_gesture,
         base::Bind(&PermissionManager::OnPermissionsRequestResponseStatus,
@@ skipping 222 matching lines @@
     const GURL& embedding_origin) {
   PermissionContextBase* context = GetPermissionContext(permission);
   PermissionResult result = context->GetPermissionStatus(
       render_frame_host, requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
   DCHECK(result.content_setting == CONTENT_SETTING_ALLOW ||
          result.content_setting == CONTENT_SETTING_ASK ||
          result.content_setting == CONTENT_SETTING_BLOCK);
   return result;
 }