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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2310753002: Media Remoting: Data/Control plumbing between renderer and Media Router. (Closed)
Patch Set: xjz's PS4 comments addressed. Created 4 years, 3 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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h" 311 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
312 #endif 312 #endif
313 313
314 #if defined(ENABLE_WEBRTC) 314 #if defined(ENABLE_WEBRTC)
315 #include "chrome/browser/media/audio_debug_recordings_handler.h" 315 #include "chrome/browser/media/audio_debug_recordings_handler.h"
316 #include "chrome/browser/media/webrtc/webrtc_event_log_handler.h" 316 #include "chrome/browser/media/webrtc/webrtc_event_log_handler.h"
317 #include "chrome/browser/media/webrtc/webrtc_logging_handler_host.h" 317 #include "chrome/browser/media/webrtc/webrtc_logging_handler_host.h"
318 #endif 318 #endif
319 319
320 #if defined(ENABLE_MEDIA_ROUTER) 320 #if defined(ENABLE_MEDIA_ROUTER)
321 #include "chrome/browser/media/cast_remoting_connector.h"
321 #include "chrome/browser/media/router/media_router_feature.h" 322 #include "chrome/browser/media/router/media_router_feature.h"
322 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 323 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
323 #endif 324 #endif
324 325
325 #if defined(ENABLE_WAYLAND_SERVER) 326 #if defined(ENABLE_WAYLAND_SERVER)
326 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 327 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
327 #endif 328 #endif
328 329
329 #if defined(ENABLE_MOJO_MEDIA) 330 #if defined(ENABLE_MOJO_MEDIA)
330 #include "chrome/browser/media/output_protection_impl.h" 331 #include "chrome/browser/media/output_protection_impl.h"
(...skipping 2596 matching lines...) Expand 10 before | Expand all | Expand 10 after
2927 2928
2928 registry->AddInterface( 2929 registry->AddInterface(
2929 base::Bind(&password_manager::ContentPasswordManagerDriverFactory:: 2930 base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
2930 BindPasswordManagerDriver, 2931 BindPasswordManagerDriver,
2931 render_frame_host)); 2932 render_frame_host));
2932 2933
2933 #if BUILDFLAG(ANDROID_JAVA_UI) 2934 #if BUILDFLAG(ANDROID_JAVA_UI)
2934 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( 2935 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(
2935 registry, render_frame_host); 2936 registry, render_frame_host);
2936 #endif 2937 #endif
2938
2939 #if defined(ENABLE_MEDIA_ROUTER)
2940 registry->AddInterface(
2941 base::Bind(&CastRemotingConnector::CreateRemoterFactory,
2942 render_frame_host));
2943 #endif
2937 } 2944 }
2938 2945
2939 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( 2946 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
2940 shell::InterfaceRegistry* registry, 2947 shell::InterfaceRegistry* registry,
2941 content::GpuProcessHost* render_process_host) { 2948 content::GpuProcessHost* render_process_host) {
2942 } 2949 }
2943 2950
2944 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2951 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2945 StaticMojoApplicationMap* apps) { 2952 StaticMojoApplicationMap* apps) {
2946 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2953 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
3168 if (channel <= kMaxDisableEncryptionChannel) { 3175 if (channel <= kMaxDisableEncryptionChannel) {
3169 static const char* const kWebRtcDevSwitchNames[] = { 3176 static const char* const kWebRtcDevSwitchNames[] = {
3170 switches::kDisableWebRtcEncryption, 3177 switches::kDisableWebRtcEncryption,
3171 }; 3178 };
3172 to_command_line->CopySwitchesFrom(from_command_line, 3179 to_command_line->CopySwitchesFrom(from_command_line,
3173 kWebRtcDevSwitchNames, 3180 kWebRtcDevSwitchNames,
3174 arraysize(kWebRtcDevSwitchNames)); 3181 arraysize(kWebRtcDevSwitchNames));
3175 } 3182 }
3176 } 3183 }
3177 #endif // defined(ENABLE_WEBRTC) 3184 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698