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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed notification registration. Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/sync_setup_overlay.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc (revision 98647)
+++ chrome/browser/profiles/profile_impl.cc (working copy)
@@ -683,6 +683,11 @@
// Remove pref observers
pref_change_registrar_.RemoveAll();
+ // The sync service needs to be deleted before the services it calls.
+ // TODO(stevet): Make ProfileSyncService into a PKS and let the PDM take care
+ // of the cleanup below.
+ sync_service_.reset();
+
ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
if (db_tracker_) {
@@ -701,9 +706,6 @@
download_manager_ = NULL;
}
- // The sync service needs to be deleted before the services it calls.
- sync_service_.reset();
-
// Password store uses WebDB, shut it down before the WebDB has been shutdown.
if (password_store_.get())
password_store_->Shutdown();
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/sync_setup_overlay.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698