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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2614873002: Ensure navigator.getVRDisplays always resolves. (Closed)
Patch Set: Addition test nits Created 3 years, 11 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 | third_party/WebKit/LayoutTests/vr/getVRDisplays_always_resolves.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index b95ef8cd1813dfa5d0afa24501567072255ab1ac..c42b652ded6a67958017054adbe9120a359087a5 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -125,9 +125,7 @@
#include "content/browser/frame_host/popup_menu_helper_mac.h"
#endif
-#if defined(ENABLE_WEBVR)
#include "device/vr/vr_service_impl.h" // nogncheck
-#endif
using base::TimeDelta;
@@ -239,6 +237,11 @@ class RemoterFactoryImpl final : public media::mojom::RemoterFactory {
};
#endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
+template <typename Interface>
+void IgnoreInterfaceRequest(mojo::InterfaceRequest<Interface> request) {
+ // Intentionally ignore the interface request.
+}
+
} // namespace
// static
@@ -2308,7 +2311,11 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
#if defined(ENABLE_WEBVR)
GetInterfaceRegistry()->AddInterface<device::mojom::VRService>(
base::Bind(&device::VRServiceImpl::Create));
+#else
+ GetInterfaceRegistry()->AddInterface<device::mojom::VRService>(
+ base::Bind(&IgnoreInterfaceRequest<device::mojom::VRService>));
#endif
+
if (base::FeatureList::IsEnabled(features::kGenericSensor)) {
GetInterfaceRegistry()->AddInterface(
base::Bind(&device::SensorProviderImpl::Create,
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/vr/getVRDisplays_always_resolves.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698