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

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: Addressed next set of comments from gab@. 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #endif 93 #endif
94 94
95 #if defined(USE_AURA) 95 #if defined(USE_AURA)
96 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 96 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
97 #endif 97 #endif
98 98
99 #if defined(OS_ANDROID) 99 #if defined(OS_ANDROID)
100 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 100 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
101 #else 101 #else
102 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h" 102 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac tory.h"
103 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
103 #endif 104 #endif
104 105
105 #if defined(ENABLE_SPELLCHECK) 106 #if defined(ENABLE_SPELLCHECK)
106 #include "chrome/browser/spellchecker/spellcheck_factory.h" 107 #include "chrome/browser/spellchecker/spellcheck_factory.h"
107 #endif 108 #endif
108 109
109 #if defined(ENABLE_SERVICE_DISCOVERY) 110 #if defined(ENABLE_SERVICE_DISCOVERY)
110 #include "chrome/browser/local_discovery/privet_notifications_factory.h" 111 #include "chrome/browser/local_discovery/privet_notifications_factory.h"
111 #endif 112 #endif
112 113
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 EphemeralAppServiceFactory::GetInstance(); 146 EphemeralAppServiceFactory::GetInstance();
146 #endif 147 #endif
147 148
148 #if defined(ENABLE_APP_LIST) 149 #if defined(ENABLE_APP_LIST)
149 app_list::AppListSyncableServiceFactory::GetInstance(); 150 app_list::AppListSyncableServiceFactory::GetInstance();
150 #endif 151 #endif
151 152
152 AboutSigninInternalsFactory::GetInstance(); 153 AboutSigninInternalsFactory::GetInstance();
153 AccountTrackerServiceFactory::GetInstance(); 154 AccountTrackerServiceFactory::GetInstance();
154 autofill::PersonalDataManagerFactory::GetInstance(); 155 autofill::PersonalDataManagerFactory::GetInstance();
156 #if !defined(OS_ANDROID)
157 AutomaticProfileResetterFactory::GetInstance();
158 #endif
155 #if defined(ENABLE_BACKGROUND) 159 #if defined(ENABLE_BACKGROUND)
156 BackgroundContentsServiceFactory::GetInstance(); 160 BackgroundContentsServiceFactory::GetInstance();
157 #endif 161 #endif
158 BookmarkModelFactory::GetInstance(); 162 BookmarkModelFactory::GetInstance();
159 #if !defined(OS_ANDROID) 163 #if !defined(OS_ANDROID)
160 BookmarkUndoServiceFactory::GetInstance(); 164 BookmarkUndoServiceFactory::GetInstance();
161 #endif 165 #endif
162 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 166 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
163 CaptivePortalServiceFactory::GetInstance(); 167 CaptivePortalServiceFactory::GetInstance();
164 #endif 168 #endif
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 TemplateURLServiceFactory::GetInstance(); 260 TemplateURLServiceFactory::GetInstance();
257 #if defined(ENABLE_THEMES) 261 #if defined(ENABLE_THEMES)
258 ThemeServiceFactory::GetInstance(); 262 ThemeServiceFactory::GetInstance();
259 #endif 263 #endif
260 WebDataServiceFactory::GetInstance(); 264 WebDataServiceFactory::GetInstance();
261 } 265 }
262 266
263 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 267 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
264 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 268 EnsureBrowserContextKeyedServiceFactoriesBuilt();
265 } 269 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698