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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2420743003: mojo VR interface simplified (Closed)
Patch Set: Address haraken@ comments Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2189 matching lines...) Expand 10 before | Expand all | Expand 10 after
2200 2200
2201 // This is to support usage of WebSockets in cases in which there is an 2201 // This is to support usage of WebSockets in cases in which there is an
2202 // associated RenderFrame. This is important for showing the correct security 2202 // associated RenderFrame. This is important for showing the correct security
2203 // state of the page and also honoring user override of bad certificates. 2203 // state of the page and also honoring user override of bad certificates.
2204 GetInterfaceRegistry()->AddInterface( 2204 GetInterfaceRegistry()->AddInterface(
2205 base::Bind(&WebSocketManager::CreateWebSocket, 2205 base::Bind(&WebSocketManager::CreateWebSocket,
2206 process_->GetID(), 2206 process_->GetID(),
2207 routing_id_)); 2207 routing_id_));
2208 2208
2209 #if defined(ENABLE_WEBVR) 2209 #if defined(ENABLE_WEBVR)
2210 GetInterfaceRegistry()->AddInterface<device::VRService>( 2210 GetInterfaceRegistry()->AddInterface<device::mojom::VRService>(
2211 base::Bind(&device::VRServiceImpl::BindRequest)); 2211 base::Bind(&device::VRServiceImpl::BindRequest));
2212 #endif 2212 #endif
2213 if (base::FeatureList::IsEnabled(features::kGenericSensor)) { 2213 if (base::FeatureList::IsEnabled(features::kGenericSensor)) {
2214 GetInterfaceRegistry()->AddInterface( 2214 GetInterfaceRegistry()->AddInterface(
2215 base::Bind(&device::SensorProviderImpl::Create), 2215 base::Bind(&device::SensorProviderImpl::Create),
2216 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 2216 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
2217 } 2217 }
2218 2218
2219 #if defined(ENABLE_WEBRTC) 2219 #if defined(ENABLE_WEBRTC)
2220 // BrowserMainLoop::GetInstance() may be null on unit tests. 2220 // BrowserMainLoop::GetInstance() may be null on unit tests.
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
3183 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3183 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3184 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3184 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3185 return web_bluetooth_service_.get(); 3185 return web_bluetooth_service_.get();
3186 } 3186 }
3187 3187
3188 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3188 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3189 web_bluetooth_service_.reset(); 3189 web_bluetooth_service_.reset();
3190 } 3190 }
3191 3191
3192 } // namespace content 3192 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/app/mojo/content_browser_manifest.json » ('j') | device/vr/android/gvr/gvr_device.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698