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 2700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2711 | 2711 |
2712 return false; | 2712 return false; |
2713 } | 2713 } |
2714 | 2714 |
2715 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { | 2715 bool ChromeContentBrowserClient::ShouldUseWindowsPrefetchArgument() const { |
2716 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument; | 2716 return startup_metric_utils::GetPreReadOptions().use_prefetch_argument; |
2717 } | 2717 } |
2718 #endif // defined(OS_WIN) | 2718 #endif // defined(OS_WIN) |
2719 | 2719 |
2720 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices( | 2720 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices( |
2721 content::ServiceRegistry* registry) { | 2721 content::ServiceRegistry* registry, |
| 2722 content::RenderProcessHost* render_process_host) { |
2722 registry->AddService( | 2723 registry->AddService( |
2723 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); | 2724 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); |
2724 } | 2725 } |
2725 | 2726 |
2726 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( | 2727 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( |
2727 content::ServiceRegistry* registry, | 2728 content::ServiceRegistry* registry, |
2728 content::RenderFrameHost* render_frame_host) { | 2729 content::RenderFrameHost* render_frame_host) { |
2729 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. | 2730 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. |
2730 #if defined(OS_CHROMEOS) | 2731 #if defined(OS_CHROMEOS) |
2731 registry->AddService( | 2732 registry->AddService( |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2961 if (channel <= kMaxDisableEncryptionChannel) { | 2962 if (channel <= kMaxDisableEncryptionChannel) { |
2962 static const char* const kWebRtcDevSwitchNames[] = { | 2963 static const char* const kWebRtcDevSwitchNames[] = { |
2963 switches::kDisableWebRtcEncryption, | 2964 switches::kDisableWebRtcEncryption, |
2964 }; | 2965 }; |
2965 to_command_line->CopySwitchesFrom(from_command_line, | 2966 to_command_line->CopySwitchesFrom(from_command_line, |
2966 kWebRtcDevSwitchNames, | 2967 kWebRtcDevSwitchNames, |
2967 arraysize(kWebRtcDevSwitchNames)); | 2968 arraysize(kWebRtcDevSwitchNames)); |
2968 } | 2969 } |
2969 } | 2970 } |
2970 #endif // defined(ENABLE_WEBRTC) | 2971 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |