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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't install message filter unless enable flag is present. Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "content/browser/renderer_host/media/video_capture_host.h" 88 #include "content/browser/renderer_host/media/video_capture_host.h"
89 #include "content/browser/renderer_host/memory_benchmark_message_filter.h" 89 #include "content/browser/renderer_host/memory_benchmark_message_filter.h"
90 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" 90 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
91 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h" 91 #include "content/browser/renderer_host/pepper/pepper_renderer_connection.h"
92 #include "content/browser/renderer_host/render_message_filter.h" 92 #include "content/browser/renderer_host/render_message_filter.h"
93 #include "content/browser/renderer_host/render_view_host_delegate.h" 93 #include "content/browser/renderer_host/render_view_host_delegate.h"
94 #include "content/browser/renderer_host/render_view_host_impl.h" 94 #include "content/browser/renderer_host/render_view_host_impl.h"
95 #include "content/browser/renderer_host/render_widget_helper.h" 95 #include "content/browser/renderer_host/render_widget_helper.h"
96 #include "content/browser/renderer_host/render_widget_host_impl.h" 96 #include "content/browser/renderer_host/render_widget_host_impl.h"
97 #include "content/browser/renderer_host/text_input_client_message_filter.h" 97 #include "content/browser/renderer_host/text_input_client_message_filter.h"
98 #include "content/browser/renderer_host/vr_message_filter.h"
98 #include "content/browser/renderer_host/websocket_dispatcher_host.h" 99 #include "content/browser/renderer_host/websocket_dispatcher_host.h"
99 #include "content/browser/resolve_proxy_msg_helper.h" 100 #include "content/browser/resolve_proxy_msg_helper.h"
100 #include "content/browser/service_worker/cache_storage_context_impl.h" 101 #include "content/browser/service_worker/cache_storage_context_impl.h"
101 #include "content/browser/service_worker/cache_storage_dispatcher_host.h" 102 #include "content/browser/service_worker/cache_storage_dispatcher_host.h"
102 #include "content/browser/service_worker/service_worker_context_wrapper.h" 103 #include "content/browser/service_worker/service_worker_context_wrapper.h"
103 #include "content/browser/service_worker/service_worker_dispatcher_host.h" 104 #include "content/browser/service_worker/service_worker_dispatcher_host.h"
104 #include "content/browser/shared_worker/shared_worker_message_filter.h" 105 #include "content/browser/shared_worker/shared_worker_message_filter.h"
105 #include "content/browser/shared_worker/worker_storage_partition.h" 106 #include "content/browser/shared_worker/worker_storage_partition.h"
106 #include "content/browser/speech/speech_recognition_dispatcher_host.h" 107 #include "content/browser/speech/speech_recognition_dispatcher_host.h"
107 #include "content/browser/storage_partition_impl.h" 108 #include "content/browser/storage_partition_impl.h"
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 storage_partition_impl_->GetGeofencingManager())); 932 storage_partition_impl_->GetGeofencingManager()));
932 AddFilter(new NavigatorConnectDispatcherHost( 933 AddFilter(new NavigatorConnectDispatcherHost(
933 storage_partition_impl_->GetNavigatorConnectContext(), 934 storage_partition_impl_->GetNavigatorConnectContext(),
934 message_port_message_filter_.get())); 935 message_port_message_filter_.get()));
935 if (browser_command_line.HasSwitch( 936 if (browser_command_line.HasSwitch(
936 switches::kEnableExperimentalWebPlatformFeatures)) { 937 switches::kEnableExperimentalWebPlatformFeatures)) {
937 scoped_refptr<BluetoothDispatcherHost> bluetooth_dispatcher_host( 938 scoped_refptr<BluetoothDispatcherHost> bluetooth_dispatcher_host(
938 BluetoothDispatcherHost::Create()); 939 BluetoothDispatcherHost::Create());
939 AddFilter(bluetooth_dispatcher_host.get()); 940 AddFilter(bluetooth_dispatcher_host.get());
940 } 941 }
942 if (browser_command_line.HasSwitch(switches::kEnableWebVR)) {
943 AddFilter(new VRMessageFilter());
944 }
941 } 945 }
942 946
943 void RenderProcessHostImpl::RegisterMojoServices() { 947 void RenderProcessHostImpl::RegisterMojoServices() {
944 mojo_application_host_->service_registry()->AddService( 948 mojo_application_host_->service_registry()->AddService(
945 base::Bind(&device::BatteryMonitorImpl::Create)); 949 base::Bind(&device::BatteryMonitorImpl::Create));
946 950
947 mojo_application_host_->service_registry()->AddService( 951 mojo_application_host_->service_registry()->AddService(
948 base::Bind(&device::VibrationManagerImpl::Create)); 952 base::Bind(&device::VibrationManagerImpl::Create));
949 953
950 mojo_application_host_->service_registry()->AddService( 954 mojo_application_host_->service_registry()->AddService(
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 switches::kEnableStrictSiteIsolation, 1302 switches::kEnableStrictSiteIsolation,
1299 switches::kEnableThreadedCompositing, 1303 switches::kEnableThreadedCompositing,
1300 switches::kEnableTouchDragDrop, 1304 switches::kEnableTouchDragDrop,
1301 switches::kEnableTouchEditing, 1305 switches::kEnableTouchEditing,
1302 switches::kEnableUnsafeES3APIs, 1306 switches::kEnableUnsafeES3APIs,
1303 switches::kEnableViewport, 1307 switches::kEnableViewport,
1304 switches::kEnableViewportMeta, 1308 switches::kEnableViewportMeta,
1305 switches::kEnableVtune, 1309 switches::kEnableVtune,
1306 switches::kEnableWebGLDraftExtensions, 1310 switches::kEnableWebGLDraftExtensions,
1307 switches::kEnableWebGLImageChromium, 1311 switches::kEnableWebGLImageChromium,
1312 switches::kEnableWebVR,
1308 switches::kForceDeviceScaleFactor, 1313 switches::kForceDeviceScaleFactor,
1309 switches::kForceDisplayList2dCanvas, 1314 switches::kForceDisplayList2dCanvas,
1310 switches::kFullMemoryCrashReport, 1315 switches::kFullMemoryCrashReport,
1311 switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode, 1316 switches::kIgnoreResolutionLimitsForAcceleratedVideoDecode,
1312 switches::kIPCConnectionTimeout, 1317 switches::kIPCConnectionTimeout,
1313 switches::kJavaScriptFlags, 1318 switches::kJavaScriptFlags,
1314 switches::kLoggingLevel, 1319 switches::kLoggingLevel,
1315 switches::kMainFrameResizesAreOrientationChanges, 1320 switches::kMainFrameResizesAreOrientationChanges,
1316 switches::kMaxUntiledLayerWidth, 1321 switches::kMaxUntiledLayerWidth,
1317 switches::kMaxUntiledLayerHeight, 1322 switches::kMaxUntiledLayerHeight,
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
2491 if (worker_ref_count_ == 0) 2496 if (worker_ref_count_ == 0)
2492 Cleanup(); 2497 Cleanup();
2493 } 2498 }
2494 2499
2495 void RenderProcessHostImpl::GetAudioOutputControllers( 2500 void RenderProcessHostImpl::GetAudioOutputControllers(
2496 const GetAudioOutputControllersCallback& callback) const { 2501 const GetAudioOutputControllersCallback& callback) const {
2497 audio_renderer_host()->GetOutputControllers(callback); 2502 audio_renderer_host()->GetOutputControllers(callback);
2498 } 2503 }
2499 2504
2500 } // namespace content 2505 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698