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

Unified Diff: chrome/browser/profile.cc

Issue 337034: Remove the browser_sync flag. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/profile.h ('k') | chrome/browser/sync/glue/bookmark_model_worker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profile.cc
===================================================================
--- chrome/browser/profile.cc (revision 30247)
+++ chrome/browser/profile.cc (working copy)
@@ -727,9 +727,7 @@
prefs->RemovePrefObserver(prefs::kEnableSpellCheck, this);
prefs->RemovePrefObserver(prefs::kEnableAutoSpellCorrect, this);
-#if defined(BROWSER_SYNC)
sync_service_.reset();
-#endif
// Both HistoryService and WebDataService maintain threads for background
// processing. Its possible each thread still has tasks on it that have
@@ -1355,7 +1353,7 @@
}
ProfileSyncService* ProfileImpl::GetProfileSyncService() {
-#if defined(BROWSER_SYNC) && !defined(OS_POSIX)
+#if !defined(OS_POSIX)
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
if (!sync_service_.get())
InitSyncService();
@@ -1366,8 +1364,6 @@
}
void ProfileImpl::InitSyncService() {
-#if defined(BROWSER_SYNC)
sync_service_.reset(new ProfileSyncService(this));
sync_service_->Initialize();
-#endif
}
« no previous file with comments | « chrome/browser/profile.h ('k') | chrome/browser/sync/glue/bookmark_model_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698