| 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 3054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3065 metrics::CallStackProfileParams::GPU_PROCESS)); | 3065 metrics::CallStackProfileParams::GPU_PROCESS)); |
| 3066 } | 3066 } |
| 3067 | 3067 |
| 3068 void ChromeContentBrowserClient::RegisterInProcessServices( | 3068 void ChromeContentBrowserClient::RegisterInProcessServices( |
| 3069 StaticServiceMap* services) { | 3069 StaticServiceMap* services) { |
| 3070 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 3070 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 3071 content::ServiceInfo info; | 3071 content::ServiceInfo info; |
| 3072 info.factory = base::Bind(&media::CreateMediaService); | 3072 info.factory = base::Bind(&media::CreateMediaService); |
| 3073 services->insert(std::make_pair("media", info)); | 3073 services->insert(std::make_pair("media", info)); |
| 3074 #endif | 3074 #endif |
| 3075 } |
| 3076 |
| 3077 void ChromeContentBrowserClient::AddConnectionFilters( |
| 3078 ConnectionFilterList* connection_filter_list) { |
| 3075 #if defined(OS_CHROMEOS) | 3079 #if defined(OS_CHROMEOS) |
| 3076 content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter( | 3080 connection_filter_list->push_back( |
| 3077 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); | 3081 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); |
| 3078 #endif // OS_CHROMEOS | 3082 #endif // OS_CHROMEOS |
| 3079 } | 3083 } |
| 3080 | 3084 |
| 3081 void ChromeContentBrowserClient::RegisterOutOfProcessServices( | 3085 void ChromeContentBrowserClient::RegisterOutOfProcessServices( |
| 3082 OutOfProcessServiceMap* services) { | 3086 OutOfProcessServiceMap* services) { |
| 3083 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 3087 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
| 3084 services->insert(std::make_pair("media", | 3088 services->insert(std::make_pair("media", |
| 3085 base::ASCIIToUTF16("Media Service"))); | 3089 base::ASCIIToUTF16("Media Service"))); |
| 3086 #endif | 3090 #endif |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3347 GetBrowserSchedulerWorkerPoolParamsFromVariations(); | 3351 GetBrowserSchedulerWorkerPoolParamsFromVariations(); |
| 3348 *index_to_traits_callback = base::Bind(&task_scheduler_util::initialization:: | 3352 *index_to_traits_callback = base::Bind(&task_scheduler_util::initialization:: |
| 3349 BrowserWorkerPoolIndexForTraits); | 3353 BrowserWorkerPoolIndexForTraits); |
| 3350 } | 3354 } |
| 3351 | 3355 |
| 3352 void ChromeContentBrowserClient:: | 3356 void ChromeContentBrowserClient:: |
| 3353 PerformExperimentalTaskSchedulerRedirections() { | 3357 PerformExperimentalTaskSchedulerRedirections() { |
| 3354 task_scheduler_util::variations:: | 3358 task_scheduler_util::variations:: |
| 3355 MaybePerformBrowserTaskSchedulerRedirection(); | 3359 MaybePerformBrowserTaskSchedulerRedirection(); |
| 3356 } | 3360 } |
| OLD | NEW |