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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups, add test for chrome keygen class Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include "apps/app_load_service_factory.h" 7 #include "apps/app_load_service_factory.h"
8 #include "apps/app_restore_service_factory.h" 8 #include "apps/app_restore_service_factory.h"
9 #include "apps/shell_window_geometry_cache.h" 9 #include "apps/shell_window_geometry_cache.h"
10 #include "chrome/browser/apps/shortcut_manager_factory.h" 10 #include "chrome/browser/apps/shortcut_manager_factory.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 #if defined(ENABLE_SPELLCHECK) 142 #if defined(ENABLE_SPELLCHECK)
143 #include "chrome/browser/extensions/api/spellcheck/spellcheck_api.h" 143 #include "chrome/browser/extensions/api/spellcheck/spellcheck_api.h"
144 #include "chrome/browser/spellchecker/spellcheck_factory.h" 144 #include "chrome/browser/spellchecker/spellcheck_factory.h"
145 #endif 145 #endif
146 146
147 #if defined(ENABLE_MDNS) 147 #if defined(ENABLE_MDNS)
148 #include "chrome/browser/local_discovery/privet_notifications_factory.h" 148 #include "chrome/browser/local_discovery/privet_notifications_factory.h"
149 #endif 149 #endif
150 150
151 #if defined(USE_NSS)
152 #include "chrome/browser/net/nss_slot_factory.h"
153 #endif
154
151 namespace chrome { 155 namespace chrome {
152 156
153 void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) { 157 void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
154 main_parts->AddParts(new ChromeBrowserMainExtraPartsProfiles()); 158 main_parts->AddParts(new ChromeBrowserMainExtraPartsProfiles());
155 } 159 }
156 160
157 } // namespace chrome 161 } // namespace chrome
158 162
159 ChromeBrowserMainExtraPartsProfiles::ChromeBrowserMainExtraPartsProfiles() { 163 ChromeBrowserMainExtraPartsProfiles::ChromeBrowserMainExtraPartsProfiles() {
160 } 164 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 local_discovery::PrivetNotificationServiceFactory::GetInstance(); 287 local_discovery::PrivetNotificationServiceFactory::GetInstance();
284 #endif 288 #endif
285 #if defined(ENABLE_MANAGED_USERS) 289 #if defined(ENABLE_MANAGED_USERS)
286 ManagedUserServiceFactory::GetInstance(); 290 ManagedUserServiceFactory::GetInstance();
287 ManagedUserSyncServiceFactory::GetInstance(); 291 ManagedUserSyncServiceFactory::GetInstance();
288 #endif 292 #endif
289 #if !defined(OS_ANDROID) 293 #if !defined(OS_ANDROID)
290 MediaGalleriesPreferencesFactory::GetInstance(); 294 MediaGalleriesPreferencesFactory::GetInstance();
291 notifier::ChromeNotifierServiceFactory::GetInstance(); 295 notifier::ChromeNotifierServiceFactory::GetInstance();
292 #endif 296 #endif
297 #if defined(USE_NSS)
298 NSSSlotFactory::GetInstance();
299 #endif
293 NTPResourceCacheFactory::GetInstance(); 300 NTPResourceCacheFactory::GetInstance();
294 PasswordStoreFactory::GetInstance(); 301 PasswordStoreFactory::GetInstance();
295 #if !defined(OS_ANDROID) 302 #if !defined(OS_ANDROID)
296 PinnedTabServiceFactory::GetInstance(); 303 PinnedTabServiceFactory::GetInstance();
297 #endif 304 #endif
298 #if defined(ENABLE_PLUGINS) 305 #if defined(ENABLE_PLUGINS)
299 PluginPrefsFactory::GetInstance(); 306 PluginPrefsFactory::GetInstance();
300 #endif 307 #endif
301 policy::ProfilePolicyConnectorFactory::GetInstance(); 308 policy::ProfilePolicyConnectorFactory::GetInstance();
302 #if defined(ENABLE_CONFIGURATION_POLICY) 309 #if defined(ENABLE_CONFIGURATION_POLICY)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 TokenServiceFactory::GetInstance(); 343 TokenServiceFactory::GetInstance();
337 #if !defined(OS_ANDROID) 344 #if !defined(OS_ANDROID)
338 UserStyleSheetWatcherFactory::GetInstance(); 345 UserStyleSheetWatcherFactory::GetInstance();
339 #endif 346 #endif
340 WebDataServiceFactory::GetInstance(); 347 WebDataServiceFactory::GetInstance();
341 } 348 }
342 349
343 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 350 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
344 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 351 EnsureBrowserContextKeyedServiceFactoriesBuilt();
345 } 352 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698