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

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

Issue 2718333002: Move ash_util functions from 'chrome' namespace to 'ash_util' namespace (Closed)
Patch Set: Rebase after https://codereview.chromium.org/2715983002 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 3219 matching lines...) Expand 10 before | Expand all | Expand 10 after
3230 { 3230 {
3231 content::ServiceInfo info; 3231 content::ServiceInfo info;
3232 info.factory = base::Bind([] { 3232 info.factory = base::Bind([] {
3233 return std::unique_ptr<service_manager::Service>( 3233 return std::unique_ptr<service_manager::Service>(
3234 base::MakeUnique<PreferencesConnectionManager>()); 3234 base::MakeUnique<PreferencesConnectionManager>());
3235 }); 3235 });
3236 info.task_runner = base::ThreadTaskRunnerHandle::Get(); 3236 info.task_runner = base::ThreadTaskRunnerHandle::Get();
3237 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); 3237 services->insert(std::make_pair(prefs::mojom::kServiceName, info));
3238 } 3238 }
3239 3239
3240 if (!chrome::IsRunningInMash()) { 3240 if (!ash_util::IsRunningInMash()) {
3241 content::ServiceInfo info; 3241 content::ServiceInfo info;
3242 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService, 3242 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService,
3243 base::ThreadTaskRunnerHandle::Get()); 3243 base::ThreadTaskRunnerHandle::Get());
3244 services->insert(std::make_pair(ash::mojom::kServiceName, info)); 3244 services->insert(std::make_pair(ash::mojom::kServiceName, info));
3245 } 3245 }
3246 #endif // OS_CHROMEOS 3246 #endif // OS_CHROMEOS
3247 } 3247 }
3248 3248
3249 void ChromeContentBrowserClient::RegisterOutOfProcessServices( 3249 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
3250 OutOfProcessServiceMap* services) { 3250 OutOfProcessServiceMap* services) {
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
3561 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3561 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3562 return variations::GetVariationParamValue( 3562 return variations::GetVariationParamValue(
3563 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3563 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3564 } 3564 }
3565 3565
3566 // static 3566 // static
3567 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3567 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3568 const storage::QuotaSettings* settings) { 3568 const storage::QuotaSettings* settings) {
3569 g_default_quota_settings = settings; 3569 g_default_quota_settings = settings;
3570 } 3570 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698