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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 3e0db368aef6a8086fc39ec146bcc9df7bf707ec..af66c7eb428c3d4b243073aa7dc584c3b7c12e6d 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -148,6 +148,10 @@
#include "chrome/browser/local_discovery/privet_notifications_factory.h"
#endif
+#if defined(USE_NSS)
+#include "chrome/browser/net/nss_slot_factory.h"
+#endif
+
namespace chrome {
void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
@@ -290,6 +294,9 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
MediaGalleriesPreferencesFactory::GetInstance();
notifier::ChromeNotifierServiceFactory::GetInstance();
#endif
+#if defined(USE_NSS)
+ NSSSlotFactory::GetInstance();
+#endif
NTPResourceCacheFactory::GetInstance();
PasswordStoreFactory::GetInstance();
#if !defined(OS_ANDROID)

Powered by Google App Engine
This is Rietveld 408576698