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

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: Just a REBASE on ToT before commit. 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h" 315 #include "components/spellcheck/browser/spellcheck_message_filter_platform.h"
316 #endif 316 #endif
317 317
318 #if defined(ENABLE_WEBRTC) 318 #if defined(ENABLE_WEBRTC)
319 #include "chrome/browser/media/audio_debug_recordings_handler.h" 319 #include "chrome/browser/media/audio_debug_recordings_handler.h"
320 #include "chrome/browser/media/webrtc/webrtc_event_log_handler.h" 320 #include "chrome/browser/media/webrtc/webrtc_event_log_handler.h"
321 #include "chrome/browser/media/webrtc/webrtc_logging_handler_host.h" 321 #include "chrome/browser/media/webrtc/webrtc_logging_handler_host.h"
322 #endif 322 #endif
323 323
324 #if defined(ENABLE_MEDIA_ROUTER) 324 #if defined(ENABLE_MEDIA_ROUTER)
325 #include "chrome/browser/media/cast_remoting_connector.h"
325 #include "chrome/browser/media/router/media_router_feature.h" 326 #include "chrome/browser/media/router/media_router_feature.h"
326 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 327 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
327 #endif 328 #endif
328 329
329 #if defined(ENABLE_WAYLAND_SERVER) 330 #if defined(ENABLE_WAYLAND_SERVER)
330 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 331 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
331 #endif 332 #endif
332 333
333 #if defined(ENABLE_MOJO_MEDIA) 334 #if defined(ENABLE_MOJO_MEDIA)
334 #include "chrome/browser/media/output_protection_impl.h" 335 #include "chrome/browser/media/output_protection_impl.h"
(...skipping 2613 matching lines...) Expand 10 before | Expand all | Expand 10 after
2948 2949
2949 registry->AddInterface( 2950 registry->AddInterface(
2950 base::Bind(&password_manager::ContentPasswordManagerDriverFactory:: 2951 base::Bind(&password_manager::ContentPasswordManagerDriverFactory::
2951 BindPasswordManagerDriver, 2952 BindPasswordManagerDriver,
2952 render_frame_host)); 2953 render_frame_host));
2953 2954
2954 #if BUILDFLAG(ANDROID_JAVA_UI) 2955 #if BUILDFLAG(ANDROID_JAVA_UI)
2955 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( 2956 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(
2956 registry, render_frame_host); 2957 registry, render_frame_host);
2957 #endif 2958 #endif
2959
2960 #if defined(ENABLE_MEDIA_ROUTER)
2961 registry->AddInterface(
2962 base::Bind(&CastRemotingConnector::CreateRemoterFactory,
2963 render_frame_host));
2964 #endif
2958 } 2965 }
2959 2966
2960 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( 2967 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
2961 shell::InterfaceRegistry* registry, 2968 shell::InterfaceRegistry* registry,
2962 content::GpuProcessHost* render_process_host) { 2969 content::GpuProcessHost* render_process_host) {
2963 registry->AddInterface( 2970 registry->AddInterface(
2964 base::Bind(&metrics::CallStackProfileCollector::Create, 2971 base::Bind(&metrics::CallStackProfileCollector::Create,
2965 metrics::CallStackProfileParams::GPU_PROCESS)); 2972 metrics::CallStackProfileParams::GPU_PROCESS));
2966 } 2973 }
2967 2974
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
3206 if (channel <= kMaxDisableEncryptionChannel) { 3213 if (channel <= kMaxDisableEncryptionChannel) {
3207 static const char* const kWebRtcDevSwitchNames[] = { 3214 static const char* const kWebRtcDevSwitchNames[] = {
3208 switches::kDisableWebRtcEncryption, 3215 switches::kDisableWebRtcEncryption,
3209 }; 3216 };
3210 to_command_line->CopySwitchesFrom(from_command_line, 3217 to_command_line->CopySwitchesFrom(from_command_line,
3211 kWebRtcDevSwitchNames, 3218 kWebRtcDevSwitchNames,
3212 arraysize(kWebRtcDevSwitchNames)); 3219 arraysize(kWebRtcDevSwitchNames));
3213 } 3220 }
3214 } 3221 }
3215 #endif // defined(ENABLE_WEBRTC) 3222 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698