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

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

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 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
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 "chrome/browser/autocomplete/shortcuts_backend_factory.h" 7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
8 #include "chrome/browser/autofill/personal_data_manager_factory.h" 8 #include "chrome/browser/autofill/personal_data_manager_factory.h"
9 #include "chrome/browser/background/background_contents_service_factory.h" 9 #include "chrome/browser/background/background_contents_service_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #endif 94 #endif
95 95
96 #if defined(USE_AURA) 96 #if defined(USE_AURA)
97 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 97 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
98 #endif 98 #endif
99 99
100 #if defined(OS_ANDROID) 100 #if defined(OS_ANDROID)
101 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 101 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
102 #else 102 #else
103 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h" 103 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h"
104 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
104 #endif 105 #endif
105 106
106 #if defined(ENABLE_SPELLCHECK) 107 #if defined(ENABLE_SPELLCHECK)
107 #include "chrome/browser/spellchecker/spellcheck_factory.h" 108 #include "chrome/browser/spellchecker/spellcheck_factory.h"
108 #endif 109 #endif
109 110
110 #if defined(ENABLE_SERVICE_DISCOVERY) 111 #if defined(ENABLE_SERVICE_DISCOVERY)
111 #include "chrome/browser/local_discovery/privet_notifications_factory.h" 112 #include "chrome/browser/local_discovery/privet_notifications_factory.h"
112 #endif 113 #endif
113 114
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 EphemeralAppServiceFactory::GetInstance(); 148 EphemeralAppServiceFactory::GetInstance();
148 #endif 149 #endif
149 150
150 #if defined(ENABLE_APP_LIST) 151 #if defined(ENABLE_APP_LIST)
151 app_list::AppListSyncableServiceFactory::GetInstance(); 152 app_list::AppListSyncableServiceFactory::GetInstance();
152 #endif 153 #endif
153 154
154 AboutSigninInternalsFactory::GetInstance(); 155 AboutSigninInternalsFactory::GetInstance();
155 AccountTrackerServiceFactory::GetInstance(); 156 AccountTrackerServiceFactory::GetInstance();
156 autofill::PersonalDataManagerFactory::GetInstance(); 157 autofill::PersonalDataManagerFactory::GetInstance();
158 #if !defined(OS_ANDROID)
159 AutomaticProfileResetterFactory::GetInstance();
160 #endif
157 #if defined(ENABLE_BACKGROUND) 161 #if defined(ENABLE_BACKGROUND)
158 BackgroundContentsServiceFactory::GetInstance(); 162 BackgroundContentsServiceFactory::GetInstance();
159 #endif 163 #endif
160 BookmarkModelFactory::GetInstance(); 164 BookmarkModelFactory::GetInstance();
161 #if !defined(OS_ANDROID) 165 #if !defined(OS_ANDROID)
162 BookmarkUndoServiceFactory::GetInstance(); 166 BookmarkUndoServiceFactory::GetInstance();
163 #endif 167 #endif
164 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 168 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
165 CaptivePortalServiceFactory::GetInstance(); 169 CaptivePortalServiceFactory::GetInstance();
166 #endif 170 #endif
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 TemplateURLServiceFactory::GetInstance(); 262 TemplateURLServiceFactory::GetInstance();
259 #if defined(ENABLE_THEMES) 263 #if defined(ENABLE_THEMES)
260 ThemeServiceFactory::GetInstance(); 264 ThemeServiceFactory::GetInstance();
261 #endif 265 #endif
262 WebDataServiceFactory::GetInstance(); 266 WebDataServiceFactory::GetInstance();
263 } 267 }
264 268
265 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 269 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
266 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 270 EnsureBrowserContextKeyedServiceFactoriesBuilt();
267 } 271 }
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/resettable_settings_snapshot.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698