| 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 2749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2760 return true; | 2760 return true; |
| 2761 } | 2761 } |
| 2762 | 2762 |
| 2763 return false; | 2763 return false; |
| 2764 } | 2764 } |
| 2765 #endif // defined(OS_WIN) | 2765 #endif // defined(OS_WIN) |
| 2766 | 2766 |
| 2767 void ChromeContentBrowserClient::ExposeInterfacesToRenderer( | 2767 void ChromeContentBrowserClient::ExposeInterfacesToRenderer( |
| 2768 shell::InterfaceRegistry* registry, | 2768 shell::InterfaceRegistry* registry, |
| 2769 content::RenderProcessHost* render_process_host) { | 2769 content::RenderProcessHost* render_process_host) { |
| 2770 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = |
| 2771 content::BrowserThread::GetTaskRunnerForThread( |
| 2772 content::BrowserThread::UI); |
| 2770 registry->AddInterface( | 2773 registry->AddInterface( |
| 2771 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); | 2774 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create), |
| 2775 ui_task_runner); |
| 2772 | 2776 |
| 2773 #if defined(OS_CHROMEOS) | 2777 #if defined(OS_CHROMEOS) |
| 2774 registry->AddInterface<metrics::mojom::LeakDetector>( | 2778 registry->AddInterface<metrics::mojom::LeakDetector>( |
| 2775 base::Bind(&metrics::LeakDetectorRemoteController::Create)); | 2779 base::Bind(&metrics::LeakDetectorRemoteController::Create), |
| 2780 ui_task_runner); |
| 2776 #endif | 2781 #endif |
| 2777 } | 2782 } |
| 2778 | 2783 |
| 2779 void ChromeContentBrowserClient::ExposeInterfacesToMediaService( | 2784 void ChromeContentBrowserClient::ExposeInterfacesToMediaService( |
| 2780 shell::InterfaceRegistry* registry, | 2785 shell::InterfaceRegistry* registry, |
| 2781 content::RenderFrameHost* render_frame_host) { | 2786 content::RenderFrameHost* render_frame_host) { |
| 2782 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. | 2787 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. |
| 2783 #if defined(OS_CHROMEOS) | 2788 #if defined(OS_CHROMEOS) |
| 2784 registry->AddInterface( | 2789 registry->AddInterface( |
| 2785 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, | 2790 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3049 if (channel <= kMaxDisableEncryptionChannel) { | 3054 if (channel <= kMaxDisableEncryptionChannel) { |
| 3050 static const char* const kWebRtcDevSwitchNames[] = { | 3055 static const char* const kWebRtcDevSwitchNames[] = { |
| 3051 switches::kDisableWebRtcEncryption, | 3056 switches::kDisableWebRtcEncryption, |
| 3052 }; | 3057 }; |
| 3053 to_command_line->CopySwitchesFrom(from_command_line, | 3058 to_command_line->CopySwitchesFrom(from_command_line, |
| 3054 kWebRtcDevSwitchNames, | 3059 kWebRtcDevSwitchNames, |
| 3055 arraysize(kWebRtcDevSwitchNames)); | 3060 arraysize(kWebRtcDevSwitchNames)); |
| 3056 } | 3061 } |
| 3057 } | 3062 } |
| 3058 #endif // defined(ENABLE_WEBRTC) | 3063 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |