| 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 2932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2943 #if BUILDFLAG(ANDROID_JAVA_UI) | 2943 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 2944 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( | 2944 ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame( |
| 2945 registry, render_frame_host); | 2945 registry, render_frame_host); |
| 2946 #endif | 2946 #endif |
| 2947 } | 2947 } |
| 2948 | 2948 |
| 2949 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( | 2949 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess( |
| 2950 shell::InterfaceRegistry* registry, | 2950 shell::InterfaceRegistry* registry, |
| 2951 content::GpuProcessHost* render_process_host) { | 2951 content::GpuProcessHost* render_process_host) { |
| 2952 registry->AddInterface( | 2952 registry->AddInterface( |
| 2953 base::Bind(&metrics::CallStackProfileCollector::Create)); | 2953 base::Bind(&metrics::CallStackProfileCollector::Create, |
| 2954 metrics::CallStackProfileParams::GPU_PROCESS)); |
| 2954 } | 2955 } |
| 2955 | 2956 |
| 2956 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 2957 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
| 2957 StaticMojoApplicationMap* apps) { | 2958 StaticMojoApplicationMap* apps) { |
| 2958 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 2959 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 2959 content::MojoApplicationInfo app_info; | 2960 content::MojoApplicationInfo app_info; |
| 2960 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); | 2961 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); |
| 2961 apps->insert(std::make_pair("mojo:media", app_info)); | 2962 apps->insert(std::make_pair("mojo:media", app_info)); |
| 2962 #endif | 2963 #endif |
| 2963 #if defined(OS_CHROMEOS) | 2964 #if defined(OS_CHROMEOS) |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3179 if (channel <= kMaxDisableEncryptionChannel) { | 3180 if (channel <= kMaxDisableEncryptionChannel) { |
| 3180 static const char* const kWebRtcDevSwitchNames[] = { | 3181 static const char* const kWebRtcDevSwitchNames[] = { |
| 3181 switches::kDisableWebRtcEncryption, | 3182 switches::kDisableWebRtcEncryption, |
| 3182 }; | 3183 }; |
| 3183 to_command_line->CopySwitchesFrom(from_command_line, | 3184 to_command_line->CopySwitchesFrom(from_command_line, |
| 3184 kWebRtcDevSwitchNames, | 3185 kWebRtcDevSwitchNames, |
| 3185 arraysize(kWebRtcDevSwitchNames)); | 3186 arraysize(kWebRtcDevSwitchNames)); |
| 3186 } | 3187 } |
| 3187 } | 3188 } |
| 3188 #endif // defined(ENABLE_WEBRTC) | 3189 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |