OLD | NEW |
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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 #endif | 312 #endif |
313 | 313 |
314 #if defined(ENABLE_MOJO_MEDIA) | 314 #if defined(ENABLE_MOJO_MEDIA) |
315 #include "chrome/browser/media/output_protection_impl.h" | 315 #include "chrome/browser/media/output_protection_impl.h" |
316 #endif | 316 #endif |
317 | 317 |
318 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 318 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
319 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck | 319 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck |
320 #endif | 320 #endif |
321 | 321 |
| 322 #if defined(OS_CHROMEOS) |
| 323 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h
" |
| 324 #endif |
| 325 |
322 using base::FileDescriptor; | 326 using base::FileDescriptor; |
323 using blink::WebWindowFeatures; | 327 using blink::WebWindowFeatures; |
324 using content::AccessTokenStore; | 328 using content::AccessTokenStore; |
325 using content::BrowserThread; | 329 using content::BrowserThread; |
326 using content::BrowserURLHandler; | 330 using content::BrowserURLHandler; |
327 using content::ChildProcessSecurityPolicy; | 331 using content::ChildProcessSecurityPolicy; |
328 using content::QuotaPermissionContext; | 332 using content::QuotaPermissionContext; |
329 using content::RenderFrameHost; | 333 using content::RenderFrameHost; |
330 using content::RenderViewHost; | 334 using content::RenderViewHost; |
331 using content::ResourceType; | 335 using content::ResourceType; |
(...skipping 2383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2715 | 2719 |
2716 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { | 2720 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { |
2717 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument; | 2721 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument; |
2718 } | 2722 } |
2719 #endif // defined(OS_WIN) | 2723 #endif // defined(OS_WIN) |
2720 | 2724 |
2721 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices( | 2725 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices( |
2722 content::ServiceRegistry* registry) { | 2726 content::ServiceRegistry* registry) { |
2723 registry->AddService( | 2727 registry->AddService( |
2724 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); | 2728 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); |
| 2729 |
| 2730 #if defined(OS_CHROMEOS) |
| 2731 registry->AddService<metrics::LeakDetectorRemote>( |
| 2732 base::Bind(&metrics::LeakDetectorRemoteController::Create)); |
| 2733 #endif |
2725 } | 2734 } |
2726 | 2735 |
2727 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( | 2736 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( |
2728 content::ServiceRegistry* registry, | 2737 content::ServiceRegistry* registry, |
2729 content::RenderFrameHost* render_frame_host) { | 2738 content::RenderFrameHost* render_frame_host) { |
2730 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. | 2739 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. |
2731 #if defined(OS_CHROMEOS) | 2740 #if defined(OS_CHROMEOS) |
2732 registry->AddService( | 2741 registry->AddService( |
2733 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, | 2742 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, |
2734 render_frame_host)); | 2743 render_frame_host)); |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2962 if (channel <= kMaxDisableEncryptionChannel) { | 2971 if (channel <= kMaxDisableEncryptionChannel) { |
2963 static const char* const kWebRtcDevSwitchNames[] = { | 2972 static const char* const kWebRtcDevSwitchNames[] = { |
2964 switches::kDisableWebRtcEncryption, | 2973 switches::kDisableWebRtcEncryption, |
2965 }; | 2974 }; |
2966 to_command_line->CopySwitchesFrom(from_command_line, | 2975 to_command_line->CopySwitchesFrom(from_command_line, |
2967 kWebRtcDevSwitchNames, | 2976 kWebRtcDevSwitchNames, |
2968 arraysize(kWebRtcDevSwitchNames)); | 2977 arraysize(kWebRtcDevSwitchNames)); |
2969 } | 2978 } |
2970 } | 2979 } |
2971 #endif // defined(ENABLE_WEBRTC) | 2980 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |