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