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 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3027 registry->AddInterface( | 3027 registry->AddInterface( |
3028 base::Bind(&metrics::CallStackProfileCollector::Create, | 3028 base::Bind(&metrics::CallStackProfileCollector::Create, |
3029 metrics::CallStackProfileParams::GPU_PROCESS)); | 3029 metrics::CallStackProfileParams::GPU_PROCESS)); |
3030 } | 3030 } |
3031 | 3031 |
3032 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 3032 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
3033 StaticMojoApplicationMap* apps) { | 3033 StaticMojoApplicationMap* apps) { |
3034 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 3034 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
3035 content::MojoApplicationInfo app_info; | 3035 content::MojoApplicationInfo app_info; |
3036 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); | 3036 app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication); |
3037 apps->insert(std::make_pair("mojo:media", app_info)); | 3037 apps->insert(std::make_pair("service:media", app_info)); |
3038 #endif | 3038 #endif |
3039 #if defined(OS_CHROMEOS) | 3039 #if defined(OS_CHROMEOS) |
3040 content::MojoShellConnection::GetForProcess()->AddConnectionFilter( | 3040 content::MojoShellConnection::GetForProcess()->AddConnectionFilter( |
3041 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); | 3041 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); |
3042 #endif // OS_CHROMEOS | 3042 #endif // OS_CHROMEOS |
3043 } | 3043 } |
3044 | 3044 |
3045 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( | 3045 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( |
3046 OutOfProcessMojoApplicationMap* apps) { | 3046 OutOfProcessMojoApplicationMap* apps) { |
3047 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 3047 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
3048 apps->insert(std::make_pair("mojo:media", | 3048 apps->insert(std::make_pair("service:media", |
3049 base::ASCIIToUTF16("Media App"))); | 3049 base::ASCIIToUTF16("Media App"))); |
3050 #endif | 3050 #endif |
3051 } | 3051 } |
3052 | 3052 |
3053 std::unique_ptr<base::Value> | 3053 std::unique_ptr<base::Value> |
3054 ChromeContentBrowserClient::GetServiceManifestOverlay( | 3054 ChromeContentBrowserClient::GetServiceManifestOverlay( |
3055 const std::string& name) { | 3055 const std::string& name) { |
3056 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 3056 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
3057 int id = -1; | 3057 int id = -1; |
3058 if (name == content::kBrowserMojoApplicationName) | 3058 if (name == content::kBrowserMojoApplicationName) |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3278 if (channel <= kMaxDisableEncryptionChannel) { | 3278 if (channel <= kMaxDisableEncryptionChannel) { |
3279 static const char* const kWebRtcDevSwitchNames[] = { | 3279 static const char* const kWebRtcDevSwitchNames[] = { |
3280 switches::kDisableWebRtcEncryption, | 3280 switches::kDisableWebRtcEncryption, |
3281 }; | 3281 }; |
3282 to_command_line->CopySwitchesFrom(from_command_line, | 3282 to_command_line->CopySwitchesFrom(from_command_line, |
3283 kWebRtcDevSwitchNames, | 3283 kWebRtcDevSwitchNames, |
3284 arraysize(kWebRtcDevSwitchNames)); | 3284 arraysize(kWebRtcDevSwitchNames)); |
3285 } | 3285 } |
3286 } | 3286 } |
3287 #endif // defined(ENABLE_WEBRTC) | 3287 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |