| 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 2777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2788 } | 2788 } |
| 2789 #endif // defined(OS_WIN) | 2789 #endif // defined(OS_WIN) |
| 2790 | 2790 |
| 2791 void ChromeContentBrowserClient::ExposeInterfacesToRenderer( | 2791 void ChromeContentBrowserClient::ExposeInterfacesToRenderer( |
| 2792 shell::InterfaceRegistry* registry, | 2792 shell::InterfaceRegistry* registry, |
| 2793 content::RenderProcessHost* render_process_host) { | 2793 content::RenderProcessHost* render_process_host) { |
| 2794 registry->AddInterface( | 2794 registry->AddInterface( |
| 2795 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); | 2795 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); |
| 2796 } | 2796 } |
| 2797 | 2797 |
| 2798 void ChromeContentBrowserClient::RegisterFrameMojoShellInterfaces( | 2798 void ChromeContentBrowserClient::ExposeInterfacesToMediaService( |
| 2799 shell::InterfaceRegistry* registry, | 2799 shell::InterfaceRegistry* registry, |
| 2800 content::RenderFrameHost* render_frame_host) { | 2800 content::RenderFrameHost* render_frame_host) { |
| 2801 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. | 2801 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. |
| 2802 #if defined(OS_CHROMEOS) | 2802 #if defined(OS_CHROMEOS) |
| 2803 registry->AddInterface( | 2803 registry->AddInterface( |
| 2804 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, | 2804 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, |
| 2805 render_frame_host)); | 2805 render_frame_host)); |
| 2806 #endif // defined(OS_CHROMEOS) | 2806 #endif // defined(OS_CHROMEOS) |
| 2807 | 2807 |
| 2808 #if defined(ENABLE_MOJO_MEDIA) | 2808 #if defined(ENABLE_MOJO_MEDIA) |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3067 if (channel <= kMaxDisableEncryptionChannel) { | 3067 if (channel <= kMaxDisableEncryptionChannel) { |
| 3068 static const char* const kWebRtcDevSwitchNames[] = { | 3068 static const char* const kWebRtcDevSwitchNames[] = { |
| 3069 switches::kDisableWebRtcEncryption, | 3069 switches::kDisableWebRtcEncryption, |
| 3070 }; | 3070 }; |
| 3071 to_command_line->CopySwitchesFrom(from_command_line, | 3071 to_command_line->CopySwitchesFrom(from_command_line, |
| 3072 kWebRtcDevSwitchNames, | 3072 kWebRtcDevSwitchNames, |
| 3073 arraysize(kWebRtcDevSwitchNames)); | 3073 arraysize(kWebRtcDevSwitchNames)); |
| 3074 } | 3074 } |
| 3075 } | 3075 } |
| 3076 #endif // defined(ENABLE_WEBRTC) | 3076 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |