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

Unified Diff: chrome/browser/sync/profile_sync_service_factory.cc

Issue 10535113: Add dependencies on HistoryService/BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« no previous file with comments | « chrome/browser/search_engines/template_url_service_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_factory.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 7ef2275a70930342f12c7481752ae0546e1bc404..8aba534520c212c8640197f6c549978332497744 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -6,13 +6,15 @@
#include "base/command_line.h"
#include "base/memory/singleton.h"
-#include "chrome/browser/defaults.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/defaults.h"
#include "chrome/browser/extensions/extension_system_factory.h"
+#include "chrome/browser/history/history_service_factory.h"
+#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
-#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sessions/tab_restore_service_factory.h"
#include "chrome/browser/signin/signin_manager.h"
@@ -56,14 +58,14 @@ ProfileSyncServiceFactory::ProfileSyncServiceFactory()
DependsOn(PasswordStoreFactory::GetInstance());
DependsOn(ExtensionSystemFactory::GetInstance());
DependsOn(WebDataServiceFactory::GetInstance());
+ DependsOn(HistoryServiceFactory::GetInstance());
+ DependsOn(BookmarkModelFactory::GetInstance());
// The following have not been converted to ProfileKeyedServices yet, and for
// now they are explicitly destroyed after the ProfileDependencyManager is
// told to DestroyProfileServices, so they will be around when the
// ProfileSyncService is destroyed.
- // DependsOn(HistoryServiceFactory::GetInstance());
- // DependsOn(BookmarkBarModelFactory::GetInstance());
// DependsOn(FaviconServiceFactory::GetInstance());
}
« no previous file with comments | « chrome/browser/search_engines/template_url_service_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698