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

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

Issue 2706383002: DO NOT SUBMIT: Show silent service manager failure (Closed)
Patch Set: Created 3 years, 10 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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/prefs/chrome_pref_service_factory.h » ('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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 #include "media/media_features.h" 189 #include "media/media_features.h"
190 #include "net/base/mime_util.h" 190 #include "net/base/mime_util.h"
191 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 191 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
192 #include "net/cookies/canonical_cookie.h" 192 #include "net/cookies/canonical_cookie.h"
193 #include "net/cookies/cookie_options.h" 193 #include "net/cookies/cookie_options.h"
194 #include "net/ssl/ssl_cert_request_info.h" 194 #include "net/ssl/ssl_cert_request_info.h"
195 #include "ppapi/features/features.h" 195 #include "ppapi/features/features.h"
196 #include "ppapi/host/ppapi_host.h" 196 #include "ppapi/host/ppapi_host.h"
197 #include "printing/features/features.h" 197 #include "printing/features/features.h"
198 #include "services/image_decoder/public/interfaces/constants.mojom.h" 198 #include "services/image_decoder/public/interfaces/constants.mojom.h"
199 #include "services/preferences/public/cpp/pref_store_manager_impl.h"
199 #include "services/preferences/public/interfaces/preferences.mojom.h" 200 #include "services/preferences/public/interfaces/preferences.mojom.h"
200 #include "services/service_manager/public/cpp/interface_provider.h" 201 #include "services/service_manager/public/cpp/interface_provider.h"
201 #include "services/service_manager/public/cpp/interface_registry.h" 202 #include "services/service_manager/public/cpp/interface_registry.h"
202 #include "services/service_manager/public/cpp/service.h" 203 #include "services/service_manager/public/cpp/service.h"
203 #include "storage/browser/fileapi/external_mount_points.h" 204 #include "storage/browser/fileapi/external_mount_points.h"
204 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h" 205 #include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
205 #include "ui/base/l10n/l10n_util.h" 206 #include "ui/base/l10n/l10n_util.h"
206 #include "ui/base/resource/resource_bundle.h" 207 #include "ui/base/resource/resource_bundle.h"
207 #include "ui/resources/grit/ui_resources.h" 208 #include "ui/resources/grit/ui_resources.h"
208 #include "url/gurl.h" 209 #include "url/gurl.h"
(...skipping 2900 matching lines...) Expand 10 before | Expand all | Expand 10 after
3109 base::MakeUnique<chromeos::ChromeInterfaceFactory>()); 3110 base::MakeUnique<chromeos::ChromeInterfaceFactory>());
3110 { 3111 {
3111 content::ServiceInfo info; 3112 content::ServiceInfo info;
3112 info.factory = base::Bind([] { 3113 info.factory = base::Bind([] {
3113 return std::unique_ptr<service_manager::Service>( 3114 return std::unique_ptr<service_manager::Service>(
3114 base::MakeUnique<PreferencesConnectionManager>()); 3115 base::MakeUnique<PreferencesConnectionManager>());
3115 }); 3116 });
3116 services->insert(std::make_pair(prefs::mojom::kServiceName, info)); 3117 services->insert(std::make_pair(prefs::mojom::kServiceName, info));
3117 } 3118 }
3118 #endif // OS_CHROMEOS 3119 #endif // OS_CHROMEOS
3120 {
3121 LOG(INFO) << "ChromeContentBrowserClient::RegisterInProcessServices";
3122 content::ServiceInfo info;
3123 info.factory = base::Bind([] {
3124 return std::unique_ptr<service_manager::Service>(
3125 base::MakeUnique<prefs::PrefStoreManagerImpl>());
3126 });
3127 // info.task_runner = base::ThreadTaskRunnerHandle::Get();
3128 services->insert(std::make_pair(prefs::mojom::kPrefStoreServiceName, info));
3129 }
3119 } 3130 }
3120 3131
3121 void ChromeContentBrowserClient::RegisterOutOfProcessServices( 3132 void ChromeContentBrowserClient::RegisterOutOfProcessServices(
3122 OutOfProcessServiceMap* services) { 3133 OutOfProcessServiceMap* services) {
3123 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) 3134 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
3124 services->insert(std::make_pair("media", 3135 services->insert(std::make_pair("media",
3125 base::ASCIIToUTF16("Media Service"))); 3136 base::ASCIIToUTF16("Media Service")));
3126 #endif 3137 #endif
3127 services->insert(std::make_pair(image_decoder::mojom::kServiceName, 3138 services->insert(std::make_pair(image_decoder::mojom::kServiceName,
3128 base::ASCIIToUTF16("Image Decoder Service"))); 3139 base::ASCIIToUTF16("Image Decoder Service")));
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
3432 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { 3443 RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
3433 return variations::GetVariationParamValue( 3444 return variations::GetVariationParamValue(
3434 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; 3445 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
3435 } 3446 }
3436 3447
3437 // static 3448 // static
3438 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3449 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3439 const storage::QuotaSettings* settings) { 3450 const storage::QuotaSettings* settings) {
3440 g_default_quota_settings = settings; 3451 g_default_quota_settings = settings;
3441 } 3452 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/prefs/chrome_pref_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698