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

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

Issue 2742523005: Revert Change ServiceManagerConnectionImpl to run service request handlers on the IO thread (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
« no previous file with comments | « no previous file | content/browser/browser_context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3214 matching lines...) Expand 10 before | Expand all | Expand 10 after
3225 base::MakeUnique<PreferencesConnectionManager>()); 3225 base::MakeUnique<PreferencesConnectionManager>());
3226 }); 3226 });
3227 info.task_runner = base::ThreadTaskRunnerHandle::Get(); 3227 info.task_runner = base::ThreadTaskRunnerHandle::Get();
3228 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); 3228 services->insert(std::make_pair(prefs::mojom::kServiceName, info));
3229 } 3229 }
3230 3230
3231 if (!ash_util::IsRunningInMash()) { 3231 if (!ash_util::IsRunningInMash()) {
3232 content::ServiceInfo info; 3232 content::ServiceInfo info;
3233 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService, 3233 info.factory = base::Bind(&ash_util::CreateEmbeddedAshService,
3234 base::ThreadTaskRunnerHandle::Get()); 3234 base::ThreadTaskRunnerHandle::Get());
3235 info.task_runner = base::ThreadTaskRunnerHandle::Get();
3236 services->insert(std::make_pair(ash::mojom::kServiceName, info)); 3235 services->insert(std::make_pair(ash::mojom::kServiceName, info));
3237 } 3236 }
3238 #endif // OS_CHROMEOS 3237 #endif // OS_CHROMEOS
3239 } 3238 }
3240 3239
3241 void ChromeContentBrowserClient::RegisterOutOfProcessServices( 3240 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
3242 OutOfProcessServiceMap* services) { 3241 OutOfProcessServiceMap* services) {
3243 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) 3242 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
3244 services->insert(std::make_pair("media", 3243 services->insert(std::make_pair("media",
3245 base::ASCIIToUTF16("Media Service"))); 3244 base::ASCIIToUTF16("Media Service")));
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
3553 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3554 return variations::GetVariationParamValue( 3553 return variations::GetVariationParamValue(
3555 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3556 } 3555 }
3557 3556
3558 // static 3557 // static
3559 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3560 const storage::QuotaSettings* settings) { 3559 const storage::QuotaSettings* settings) {
3561 g_default_quota_settings = settings; 3560 g_default_quota_settings = settings;
3562 } 3561 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698