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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 "but blink-settings switch already specified."; 1472 "but blink-settings switch already specified.";
1473 return; 1473 return;
1474 } 1474 }
1475 1475
1476 command_line->AppendSwitchASCII(switches::kBlinkSettings, 1476 command_line->AppendSwitchASCII(switches::kBlinkSettings,
1477 base::JoinString(blink_settings, ",")); 1477 base::JoinString(blink_settings, ","));
1478 } 1478 }
1479 1479
1480 #if BUILDFLAG(ANDROID_JAVA_UI) 1480 #if BUILDFLAG(ANDROID_JAVA_UI)
1481 void ForwardShareServiceRequest( 1481 void ForwardShareServiceRequest(
1482 base::WeakPtr<shell::InterfaceProvider> interface_provider, 1482 base::WeakPtr<service_manager::InterfaceProvider> interface_provider,
1483 blink::mojom::ShareServiceRequest request) { 1483 blink::mojom::ShareServiceRequest request) {
1484 if (!interface_provider || 1484 if (!interface_provider ||
1485 ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) { 1485 ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
1486 return; 1486 return;
1487 } 1487 }
1488 interface_provider->GetInterface(std::move(request)); 1488 interface_provider->GetInterface(std::move(request));
1489 } 1489 }
1490 #endif 1490 #endif
1491 1491
1492 } // namespace 1492 } // namespace
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
2877 sandbox::TargetPolicy::SUBSYS_NAMED_PIPES, 2877 sandbox::TargetPolicy::SUBSYS_NAMED_PIPES,
2878 sandbox::TargetPolicy::NAMEDPIPES_ALLOW_ANY, 2878 sandbox::TargetPolicy::NAMEDPIPES_ALLOW_ANY,
2879 L"\\\\.\\pipe\\chrome.nacl.*"); 2879 L"\\\\.\\pipe\\chrome.nacl.*");
2880 if (result != sandbox::SBOX_ALL_OK) 2880 if (result != sandbox::SBOX_ALL_OK)
2881 return false; 2881 return false;
2882 return result == sandbox::SBOX_ALL_OK; 2882 return result == sandbox::SBOX_ALL_OK;
2883 } 2883 }
2884 #endif // defined(OS_WIN) 2884 #endif // defined(OS_WIN)
2885 2885
2886 void ChromeContentBrowserClient::ExposeInterfacesToRenderer( 2886 void ChromeContentBrowserClient::ExposeInterfacesToRenderer(
2887 shell::InterfaceRegistry* registry, 2887 service_manager::InterfaceRegistry* registry,
2888 content::RenderProcessHost* render_process_host) { 2888 content::RenderProcessHost* render_process_host) {
2889 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = 2889 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner =
2890 content::BrowserThread::GetTaskRunnerForThread( 2890 content::BrowserThread::GetTaskRunnerForThread(
2891 content::BrowserThread::UI); 2891 content::BrowserThread::UI);
2892 registry->AddInterface( 2892 registry->AddInterface(
2893 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create), 2893 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create),
2894 ui_task_runner); 2894 ui_task_runner);
2895 registry->AddInterface( 2895 registry->AddInterface(
2896 base::Bind(&BudgetServiceImpl::Create, render_process_host->GetID()), 2896 base::Bind(&BudgetServiceImpl::Create, render_process_host->GetID()),
2897 ui_task_runner); 2897 ui_task_runner);
2898 registry->AddInterface( 2898 registry->AddInterface(
2899 base::Bind(&rappor::RapporRecorderImpl::Create, 2899 base::Bind(&rappor::RapporRecorderImpl::Create,
2900 g_browser_process->rappor_service()), 2900 g_browser_process->rappor_service()),
2901 ui_task_runner); 2901 ui_task_runner);
2902 2902
2903 #if defined(OS_CHROMEOS) 2903 #if defined(OS_CHROMEOS)
2904 registry->AddInterface<metrics::mojom::LeakDetector>( 2904 registry->AddInterface<metrics::mojom::LeakDetector>(
2905 base::Bind(&metrics::LeakDetectorRemoteController::Create), 2905 base::Bind(&metrics::LeakDetectorRemoteController::Create),
2906 ui_task_runner); 2906 ui_task_runner);
2907 #endif 2907 #endif
2908 } 2908 }
2909 2909
2910 void ChromeContentBrowserClient::ExposeInterfacesToMediaService( 2910 void ChromeContentBrowserClient::ExposeInterfacesToMediaService(
2911 shell::InterfaceRegistry* registry, 2911 service_manager::InterfaceRegistry* registry,
2912 content::RenderFrameHost* render_frame_host) { 2912 content::RenderFrameHost* render_frame_host) {
2913 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. 2913 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
2914 #if defined(OS_CHROMEOS) 2914 #if defined(OS_CHROMEOS)
2915 registry->AddInterface( 2915 registry->AddInterface(
2916 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2916 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2917 render_frame_host)); 2917 render_frame_host));
2918 #endif // defined(OS_CHROMEOS) 2918 #endif // defined(OS_CHROMEOS)
2919 2919
2920 #if defined(ENABLE_MOJO_MEDIA) 2920 #if defined(ENABLE_MOJO_MEDIA)
2921 registry->AddInterface( 2921 registry->AddInterface(
2922 base::Bind(&OutputProtectionImpl::Create, render_frame_host)); 2922 base::Bind(&OutputProtectionImpl::Create, render_frame_host));
2923 #endif // defined(ENABLE_MOJO_MEDIA) 2923 #endif // defined(ENABLE_MOJO_MEDIA)
2924 } 2924 }
2925 2925
2926 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces( 2926 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
2927 shell::InterfaceRegistry* registry, 2927 service_manager::InterfaceRegistry* registry,
2928 content::RenderFrameHost* render_frame_host) { 2928 content::RenderFrameHost* render_frame_host) {
2929 if (base::FeatureList::IsEnabled(features::kWebUsb) 2929 if (base::FeatureList::IsEnabled(features::kWebUsb)
2930 #if defined(ENABLE_EXTENSIONS) 2930 #if defined(ENABLE_EXTENSIONS)
2931 && 2931 &&
2932 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( 2932 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
2933 extensions::kExtensionScheme) 2933 extensions::kExtensionScheme)
2934 #endif 2934 #endif
2935 ) { 2935 ) {
2936 registry->AddInterface( 2936 registry->AddInterface(
2937 base::Bind(&CreateUsbDeviceManager, render_frame_host)); 2937 base::Bind(&CreateUsbDeviceManager, render_frame_host));
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
2980 #endif 2980 #endif
2981 2981
2982 #if defined(ENABLE_MEDIA_ROUTER) 2982 #if defined(ENABLE_MEDIA_ROUTER)
2983 registry->AddInterface( 2983 registry->AddInterface(
2984 base::Bind(&CastRemotingConnector::CreateRemoterFactory, 2984 base::Bind(&CastRemotingConnector::CreateRemoterFactory,
2985 render_frame_host)); 2985 render_frame_host));
2986 #endif 2986 #endif
2987 } 2987 }
2988 2988
2989 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( 2989 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
2990 shell::InterfaceRegistry* registry, 2990 service_manager::InterfaceRegistry* registry,
2991 content::GpuProcessHost* render_process_host) { 2991 content::GpuProcessHost* render_process_host) {
2992 registry->AddInterface( 2992 registry->AddInterface(
2993 base::Bind(&metrics::CallStackProfileCollector::Create, 2993 base::Bind(&metrics::CallStackProfileCollector::Create,
2994 metrics::CallStackProfileParams::GPU_PROCESS)); 2994 metrics::CallStackProfileParams::GPU_PROCESS));
2995 } 2995 }
2996 2996
2997 void ChromeContentBrowserClient::RegisterInProcessServices( 2997 void ChromeContentBrowserClient::RegisterInProcessServices(
2998 StaticServiceMap* services) { 2998 StaticServiceMap* services) {
2999 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 2999 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
3000 content::ServiceInfo info; 3000 content::ServiceInfo info;
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
3249 kWebRtcDevSwitchNames, 3249 kWebRtcDevSwitchNames,
3250 arraysize(kWebRtcDevSwitchNames)); 3250 arraysize(kWebRtcDevSwitchNames));
3251 } 3251 }
3252 } 3252 }
3253 #endif // defined(ENABLE_WEBRTC) 3253 #endif // defined(ENABLE_WEBRTC)
3254 3254
3255 std::unique_ptr<content::MemoryCoordinatorDelegate> 3255 std::unique_ptr<content::MemoryCoordinatorDelegate>
3256 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { 3256 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() {
3257 return memory::ChromeMemoryCoordinatorDelegate::Create(); 3257 return memory::ChromeMemoryCoordinatorDelegate::Create();
3258 } 3258 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698