| Index: chrome/browser/permissions/permission_manager.cc
|
| diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
|
| index bed2a61d7364ea0cbc3ff26275c73e31d4b4447d..783fe274a6cc294502bbd2554412859db8ae4e10 100644
|
| --- a/chrome/browser/permissions/permission_manager.cc
|
| +++ b/chrome/browser/permissions/permission_manager.cc
|
| @@ -31,8 +31,13 @@
|
| #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
|
| @@ -287,6 +292,13 @@ int PermissionManager::RequestPermissions(
|
| 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;
|
| + }
|
| +#endif // BUILDFLAG(ENABLE_VR)
|
| +
|
| const PermissionRequestID request(render_frame_host, request_id);
|
|
|
| for (size_t i = 0; i < permissions.size(); ++i) {
|
|
|