Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2721153004: Remove ash_util namespace (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3223 matching lines...) Expand 10 before | Expand all | Expand 10 after
3234 { 3234 {
3235 content::ServiceInfo info; 3235 content::ServiceInfo info;
3236 info.factory = base::Bind([] { 3236 info.factory = base::Bind([] {
3237 return std::unique_ptr<service_manager::Service>( 3237 return std::unique_ptr<service_manager::Service>(
3238 base::MakeUnique<PreferencesConnectionManager>()); 3238 base::MakeUnique<PreferencesConnectionManager>());
3239 }); 3239 });
3240 info.task_runner = base::ThreadTaskRunnerHandle::Get(); 3240 info.task_runner = base::ThreadTaskRunnerHandle::Get();
3241 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); 3241 services->insert(std::make_pair(prefs::mojom::kServiceName, info));
3242 } 3242 }
3243 3243
3244 if (!ash_util::IsRunningInMash()) { 3244 if (!IsRunningInMash()) {
3245 content::ServiceInfo info; 3245 content::ServiceInfo info;
3246 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService, 3246 info.factory = base::Bind(&CreateEmbeddedAshService,
3247 base::ThreadTaskRunnerHandle::Get()); 3247 base::ThreadTaskRunnerHandle::Get());
3248 services->insert(std::make_pair(ash::mojom::kServiceName, info)); 3248 services->insert(std::make_pair(ash::mojom::kServiceName, info));
3249 } 3249 }
3250 #endif // OS_CHROMEOS 3250 #endif // OS_CHROMEOS
3251 } 3251 }
3252 3252
3253 void ChromeContentBrowserClient::RegisterOutOfProcessServices( 3253 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
3254 OutOfProcessServiceMap* services) { 3254 OutOfProcessServiceMap* services) {
3255 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) 3255 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
3256 services->insert(std::make_pair("media", 3256 services->insert(std::make_pair("media",
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
3565 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3565 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3566 return variations::GetVariationParamValue( 3566 return variations::GetVariationParamValue(
3567 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3567 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3568 } 3568 }
3569 3569
3570 // static 3570 // static
3571 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3571 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3572 const storage::QuotaSettings* settings) { 3572 const storage::QuotaSettings* settings) {
3573 g_default_quota_settings = settings; 3573 g_default_quota_settings = settings;
3574 } 3574 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698