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

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: 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h" 313 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
314 #endif 314 #endif
315 315
316 #if defined(ENABLE_WEBRTC) 316 #if defined(ENABLE_WEBRTC)
317 #include "chrome/browser/media/audio_debug_recordings_handler.h" 317 #include "chrome/browser/media/audio_debug_recordings_handler.h"
318 #include "chrome/browser/media/webrtc_event_log_handler.h" 318 #include "chrome/browser/media/webrtc_event_log_handler.h"
319 #include "chrome/browser/media/webrtc_logging_handler_host.h" 319 #include "chrome/browser/media/webrtc_logging_handler_host.h"
320 #endif 320 #endif
321 321
322 #if defined(ENABLE_MEDIA_ROUTER) 322 #if defined(ENABLE_MEDIA_ROUTER)
323 #include "chrome/browser/media/cast_remoting_connector.h"
323 #include "chrome/browser/media/router/media_router_feature.h" 324 #include "chrome/browser/media/router/media_router_feature.h"
324 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 325 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
325 #endif 326 #endif
326 327
327 #if defined(ENABLE_WAYLAND_SERVER) 328 #if defined(ENABLE_WAYLAND_SERVER)
328 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 329 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
329 #endif 330 #endif
330 331
331 #if defined(ENABLE_MOJO_MEDIA) 332 #if defined(ENABLE_MOJO_MEDIA)
332 #include "chrome/browser/media/output_protection_impl.h" 333 #include "chrome/browser/media/output_protection_impl.h"
(...skipping 2598 matching lines...) Expand 10 before | Expand all | Expand 10 after
2931 } 2932 }
2932 2933
2933 registry->AddInterface( 2934 registry->AddInterface(
2934 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, 2935 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
2935 render_frame_host)); 2936 render_frame_host));
2936 2937
2937 #if BUILDFLAG(ANDROID_JAVA_UI) 2938 #if BUILDFLAG(ANDROID_JAVA_UI)
2938 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( 2939 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(
2939 registry, render_frame_host); 2940 registry, render_frame_host);
2940 #endif 2941 #endif
2942
2943 #if defined(ENABLE_MEDIA_ROUTER)
2944 registry->AddInterface(
2945 base::Bind(&CastRemotingConnector::CreateRemoterFactory,
2946 render_frame_host));
2947 #endif
2941 } 2948 }
2942 2949
2943 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( 2950 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
2944 shell::InterfaceRegistry* registry, 2951 shell::InterfaceRegistry* registry,
2945 content::GpuProcessHost* render_process_host) { 2952 content::GpuProcessHost* render_process_host) {
2946 } 2953 }
2947 2954
2948 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2955 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2949 StaticMojoApplicationMap* apps) { 2956 StaticMojoApplicationMap* apps) {
2950 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2957 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
3172 if (channel <= kMaxDisableEncryptionChannel) { 3179 if (channel <= kMaxDisableEncryptionChannel) {
3173 static const char* const kWebRtcDevSwitchNames[] = { 3180 static const char* const kWebRtcDevSwitchNames[] = {
3174 switches::kDisableWebRtcEncryption, 3181 switches::kDisableWebRtcEncryption,
3175 }; 3182 };
3176 to_command_line->CopySwitchesFrom(from_command_line, 3183 to_command_line->CopySwitchesFrom(from_command_line,
3177 kWebRtcDevSwitchNames, 3184 kWebRtcDevSwitchNames,
3178 arraysize(kWebRtcDevSwitchNames)); 3185 arraysize(kWebRtcDevSwitchNames));
3179 } 3186 }
3180 } 3187 }
3181 #endif // defined(ENABLE_WEBRTC) 3188 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698