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

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

Issue 10873022: Revert 152904 - Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/profile_dependency_manager.h" 5 #include "chrome/browser/profiles/profile_dependency_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 #include <iterator> 9 #include <iterator>
10 10
11 #include "chrome/browser/autofill/personal_data_manager_factory.h" 11 #include "chrome/browser/autofill/personal_data_manager_factory.h"
12 #include "chrome/browser/background/background_contents_service_factory.h" 12 #include "chrome/browser/background/background_contents_service_factory.h"
13 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
14 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 14 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
15 #include "chrome/browser/content_settings/cookie_settings.h" 15 #include "chrome/browser/content_settings/cookie_settings.h"
16 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" 16 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
17 #include "chrome/browser/download/download_service_factory.h" 17 #include "chrome/browser/download/download_service_factory.h"
18 #include "chrome/browser/extensions/api/commands/command_service_factory.h" 18 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
19 #include "chrome/browser/extensions/api/discovery/suggested_links_registry_facto ry.h" 19 #include "chrome/browser/extensions/api/discovery/suggested_links_registry_facto ry.h"
20 #include "chrome/browser/extensions/extension_system_factory.h" 20 #include "chrome/browser/extensions/extension_system_factory.h"
21 #include "chrome/browser/favicon/favicon_service_factory.h"
22 #include "chrome/browser/google/google_url_tracker_factory.h" 21 #include "chrome/browser/google/google_url_tracker_factory.h"
23 #include "chrome/browser/history/history_service_factory.h" 22 #include "chrome/browser/history/history_service_factory.h"
24 #include "chrome/browser/history/shortcuts_backend_factory.h" 23 #include "chrome/browser/history/shortcuts_backend_factory.h"
25 #include "chrome/browser/intents/web_intents_registry_factory.h" 24 #include "chrome/browser/intents/web_intents_registry_factory.h"
26 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h" 25 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
27 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 26 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
28 #include "chrome/browser/password_manager/password_store_factory.h" 27 #include "chrome/browser/password_manager/password_store_factory.h"
29 #include "chrome/browser/plugin_prefs_factory.h" 28 #include "chrome/browser/plugin_prefs_factory.h"
30 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" 29 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
31 #include "chrome/browser/predictors/predictor_database_factory.h" 30 #include "chrome/browser/predictors/predictor_database_factory.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 CookieSettings::Factory::GetInstance(); 209 CookieSettings::Factory::GetInstance();
211 #if defined(ENABLE_NOTIFICATIONS) 210 #if defined(ENABLE_NOTIFICATIONS)
212 DesktopNotificationServiceFactory::GetInstance(); 211 DesktopNotificationServiceFactory::GetInstance();
213 #endif 212 #endif
214 DownloadServiceFactory::GetInstance(); 213 DownloadServiceFactory::GetInstance();
215 #if defined(ENABLE_EXTENSIONS) 214 #if defined(ENABLE_EXTENSIONS)
216 extensions::CommandServiceFactory::GetInstance(); 215 extensions::CommandServiceFactory::GetInstance();
217 extensions::SuggestedLinksRegistryFactory::GetInstance(); 216 extensions::SuggestedLinksRegistryFactory::GetInstance();
218 extensions::ExtensionSystemFactory::GetInstance(); 217 extensions::ExtensionSystemFactory::GetInstance();
219 #endif 218 #endif
220 FaviconServiceFactory::GetInstance();
221 FindBarStateFactory::GetInstance(); 219 FindBarStateFactory::GetInstance();
222 #if defined(USE_AURA) 220 #if defined(USE_AURA)
223 GesturePrefsObserverFactoryAura::GetInstance(); 221 GesturePrefsObserverFactoryAura::GetInstance();
224 #endif 222 #endif
225 GlobalErrorServiceFactory::GetInstance(); 223 GlobalErrorServiceFactory::GetInstance();
226 GoogleURLTrackerFactory::GetInstance(); 224 GoogleURLTrackerFactory::GetInstance();
227 HistoryServiceFactory::GetInstance(); 225 HistoryServiceFactory::GetInstance();
228 #if defined(ENABLE_CONFIGURATION_POLICY) 226 #if defined(ENABLE_CONFIGURATION_POLICY)
229 ManagedModePolicyProviderFactory::GetInstance(); 227 ManagedModePolicyProviderFactory::GetInstance();
230 #endif 228 #endif
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 } 378 }
381 379
382 result.append("\n /* Toplevel profile */\n"); 380 result.append("\n /* Toplevel profile */\n");
383 result.append(" Profile [shape=box];\n"); 381 result.append(" Profile [shape=box];\n");
384 382
385 result.append("}\n"); 383 result.append("}\n");
386 return result; 384 return result;
387 } 385 }
388 386
389 #endif 387 #endif
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698