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

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

Issue 2138013003: media::mojom::Remoter and CastRemotingConnector/Sender (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split-out some interfaces in prep for landing multi-part changes. Created 4 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/media/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 #endif 303 #endif
304 304
305 #if defined(ENABLE_WEBRTC) 305 #if defined(ENABLE_WEBRTC)
306 #include "chrome/browser/media/audio_debug_recordings_handler.h" 306 #include "chrome/browser/media/audio_debug_recordings_handler.h"
307 #include "chrome/browser/media/webrtc_event_log_handler.h" 307 #include "chrome/browser/media/webrtc_event_log_handler.h"
308 #include "chrome/browser/media/webrtc_logging_handler_host.h" 308 #include "chrome/browser/media/webrtc_logging_handler_host.h"
309 #endif 309 #endif
310 310
311 #if defined(ENABLE_MEDIA_ROUTER) 311 #if defined(ENABLE_MEDIA_ROUTER)
312 #include "chrome/browser/media/router/media_router_feature.h" 312 #include "chrome/browser/media/router/media_router_feature.h"
313 #include "chrome/browser/media/router/media_remoting_connector.h"
313 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 314 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
314 #endif 315 #endif
315 316
316 #if defined(ENABLE_WAYLAND_SERVER) 317 #if defined(ENABLE_WAYLAND_SERVER)
317 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 318 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
318 #endif 319 #endif
319 320
320 #if defined(ENABLE_MOJO_MEDIA) 321 #if defined(ENABLE_MOJO_MEDIA)
321 #include "chrome/browser/media/output_protection_impl.h" 322 #include "chrome/browser/media/output_protection_impl.h"
322 #endif 323 #endif
(...skipping 2511 matching lines...) Expand 10 before | Expand all | Expand 10 after
2834 } 2835 }
2835 2836
2836 registry->AddInterface( 2837 registry->AddInterface(
2837 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver, 2838 base::Bind(&autofill::ContentAutofillDriverFactory::BindAutofillDriver,
2838 render_frame_host)); 2839 render_frame_host));
2839 2840
2840 #if BUILDFLAG(ANDROID_JAVA_UI) 2841 #if BUILDFLAG(ANDROID_JAVA_UI)
2841 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoInterfaces( 2842 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoInterfaces(
2842 registry, render_frame_host); 2843 registry, render_frame_host);
2843 #endif 2844 #endif
2845
2846 #if defined(ENABLE_MEDIA_ROUTER)
2847 registry->AddInterface(
2848 base::Bind(&media_router::MediaRemotingConnector::CreateRemoter,
2849 render_frame_host));
2850 #endif
2844 } 2851 }
2845 2852
2846 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( 2853 void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
2847 StaticMojoApplicationMap* apps) { 2854 StaticMojoApplicationMap* apps) {
2848 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2855 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
2849 content::MojoApplicationInfo app_info; 2856 content::MojoApplicationInfo app_info;
2850 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); 2857 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication);
2851 apps->insert(std::make_pair("mojo:media", app_info)); 2858 apps->insert(std::make_pair("mojo:media", app_info));
2852 #endif 2859 #endif
2853 #if defined(OS_CHROMEOS) 2860 #if defined(OS_CHROMEOS)
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
3047 if (channel <= kMaxDisableEncryptionChannel) { 3054 if (channel <= kMaxDisableEncryptionChannel) {
3048 static const char* const kWebRtcDevSwitchNames[] = { 3055 static const char* const kWebRtcDevSwitchNames[] = {
3049 switches::kDisableWebRtcEncryption, 3056 switches::kDisableWebRtcEncryption,
3050 }; 3057 };
3051 to_command_line->CopySwitchesFrom(from_command_line, 3058 to_command_line->CopySwitchesFrom(from_command_line,
3052 kWebRtcDevSwitchNames, 3059 kWebRtcDevSwitchNames,
3053 arraysize(kWebRtcDevSwitchNames)); 3060 arraysize(kWebRtcDevSwitchNames));
3054 } 3061 }
3055 } 3062 }
3056 #endif // defined(ENABLE_WEBRTC) 3063 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698