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 3213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3224 base::MakeUnique<PreferencesConnectionManager>()); | 3224 base::MakeUnique<PreferencesConnectionManager>()); |
3225 }); | 3225 }); |
3226 info.task_runner = base::ThreadTaskRunnerHandle::Get(); | 3226 info.task_runner = base::ThreadTaskRunnerHandle::Get(); |
3227 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); | 3227 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); |
3228 } | 3228 } |
3229 | 3229 |
3230 if (!ash_util::IsRunningInMash()) { | 3230 if (!ash_util::IsRunningInMash()) { |
3231 content::ServiceInfo info; | 3231 content::ServiceInfo info; |
3232 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService, | 3232 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService, |
3233 base::ThreadTaskRunnerHandle::Get()); | 3233 base::ThreadTaskRunnerHandle::Get()); |
| 3234 info.task_runner = base::ThreadTaskRunnerHandle::Get(); |
3234 services->insert(std::make_pair(ash::mojom::kServiceName, info)); | 3235 services->insert(std::make_pair(ash::mojom::kServiceName, info)); |
3235 } | 3236 } |
3236 #endif // OS_CHROMEOS | 3237 #endif // OS_CHROMEOS |
3237 } | 3238 } |
3238 | 3239 |
3239 void ChromeContentBrowserClient::RegisterOutOfProcessServices( | 3240 void ChromeContentBrowserClient::RegisterOutOfProcessServices( |
3240 OutOfProcessServiceMap* services) { | 3241 OutOfProcessServiceMap* services) { |
3241 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 3242 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
3242 services->insert(std::make_pair("media", | 3243 services->insert(std::make_pair("media", |
3243 base::ASCIIToUTF16("Media Service"))); | 3244 base::ASCIIToUTF16("Media Service"))); |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3551 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
3552 return variations::GetVariationParamValue( | 3553 return variations::GetVariationParamValue( |
3553 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
3554 } | 3555 } |
3555 | 3556 |
3556 // static | 3557 // static |
3557 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
3558 const storage::QuotaSettings* settings) { | 3559 const storage::QuotaSettings* settings) { |
3559 g_default_quota_settings = settings; | 3560 g_default_quota_settings = settings; |
3560 } | 3561 } |
OLD | NEW |