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

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

Issue 24533002: Added the AutomaticProfileResetter service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final touches on unittests. Created 7 years, 2 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 #if defined(USE_AURA) 133 #if defined(USE_AURA)
134 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 134 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
135 #endif 135 #endif
136 136
137 #if defined(OS_ANDROID) 137 #if defined(OS_ANDROID)
138 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 138 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
139 #else 139 #else
140 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" 140 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
141 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h" 141 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h"
142 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
142 #endif 143 #endif
143 144
144 #if defined(ENABLE_SPELLCHECK) 145 #if defined(ENABLE_SPELLCHECK)
145 #include "chrome/browser/extensions/api/spellcheck/spellcheck_api.h" 146 #include "chrome/browser/extensions/api/spellcheck/spellcheck_api.h"
146 #include "chrome/browser/spellchecker/spellcheck_factory.h" 147 #include "chrome/browser/spellchecker/spellcheck_factory.h"
147 #endif 148 #endif
148 149
149 #if defined(ENABLE_MDNS) 150 #if defined(ENABLE_MDNS)
150 #include "chrome/browser/local_discovery/privet_notifications_factory.h" 151 #include "chrome/browser/local_discovery/privet_notifications_factory.h"
151 #endif 152 #endif
(...skipping 20 matching lines...) Expand all
172 // profile creation time. 173 // profile creation time.
173 // 174 //
174 // TODO(erg): This needs to be something else. I don't think putting every 175 // TODO(erg): This needs to be something else. I don't think putting every
175 // FooServiceFactory here will scale or is desirable long term. 176 // FooServiceFactory here will scale or is desirable long term.
176 // 177 //
177 // static 178 // static
178 void ChromeBrowserMainExtraPartsProfiles:: 179 void ChromeBrowserMainExtraPartsProfiles::
179 EnsureBrowserContextKeyedServiceFactoriesBuilt() { 180 EnsureBrowserContextKeyedServiceFactoriesBuilt() {
180 AboutSigninInternalsFactory::GetInstance(); 181 AboutSigninInternalsFactory::GetInstance();
181 autofill::PersonalDataManagerFactory::GetInstance(); 182 autofill::PersonalDataManagerFactory::GetInstance();
183 #if !defined(OS_ANDROID)
184 AutomaticProfileResetterFactory::GetInstance();
185 #endif
182 #if defined(ENABLE_BACKGROUND) 186 #if defined(ENABLE_BACKGROUND)
183 BackgroundContentsServiceFactory::GetInstance(); 187 BackgroundContentsServiceFactory::GetInstance();
184 #endif 188 #endif
185 BookmarkModelFactory::GetInstance(); 189 BookmarkModelFactory::GetInstance();
186 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 190 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
187 captive_portal::CaptivePortalServiceFactory::GetInstance(); 191 captive_portal::CaptivePortalServiceFactory::GetInstance();
188 #endif 192 #endif
189 ChromeGeolocationPermissionContextFactory::GetInstance(); 193 ChromeGeolocationPermissionContextFactory::GetInstance();
190 #if defined(OS_ANDROID) 194 #if defined(OS_ANDROID)
191 ProtectedMediaIdentifierPermissionContextFactory::GetInstance(); 195 ProtectedMediaIdentifierPermissionContextFactory::GetInstance();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 TokenServiceFactory::GetInstance(); 345 TokenServiceFactory::GetInstance();
342 #if !defined(OS_ANDROID) 346 #if !defined(OS_ANDROID)
343 UserStyleSheetWatcherFactory::GetInstance(); 347 UserStyleSheetWatcherFactory::GetInstance();
344 #endif 348 #endif
345 WebDataServiceFactory::GetInstance(); 349 WebDataServiceFactory::GetInstance();
346 } 350 }
347 351
348 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 352 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
349 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 353 EnsureBrowserContextKeyedServiceFactoriesBuilt();
350 } 354 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698