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

Unified Diff: chrome/browser/permissions/permission_manager.cc

Issue 2930993002: Fix new build break on Windows with OpenVR. (Closed)
Patch Set: Fix build break on Windows with OpenVR. Created 3 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 979ccd73bc45ee7ed4eed1af1be4167b7e23a76e..5f205178591939e9455d83bf4ca505034c7557e6 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -34,9 +34,9 @@
#include "device/vr/features/features.h"
#include "ppapi/features/features.h"
-#if BUILDFLAG(ENABLE_VR)
+#if BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
#include "chrome/browser/android/vr_shell/vr_tab_helper.h"
-#endif // BUILDFLAG(ENABLE_VR)
+#endif // BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
#if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/plugins/flash_permission_context.h"
@@ -288,13 +288,13 @@ int PermissionManager::RequestPermissions(
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
-#if BUILDFLAG(ENABLE_VR)
+#if BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
if (vr_shell::VrTabHelper::IsInVr(web_contents)) {
callback.Run(
std::vector<ContentSetting>(permissions.size(), CONTENT_SETTING_BLOCK));
return kNoPendingOperation;
}
-#endif // BUILDFLAG(ENABLE_VR)
+#endif // BUILDFLAG(ENABLE_VR) && defined(OS_ANDROID)
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
« no previous file with comments | « no previous file | chrome/browser/permissions/permission_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698