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

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

Issue 1354883003: Componentize chrome/browser/sync/backup_rollback_controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 318f894012b522441fb37b9e5498ec79d80d3511..39bc6e67dd9540bab60ca9a2806cbeadc9b694d1 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -258,7 +258,7 @@ ProfileSyncService::ProfileSyncService(
base::Bind(&ProfileSyncService::StartUpSlowBackendComponents,
startup_controller_weak_factory_.GetWeakPtr(),
SYNC)));
- backup_rollback_controller_.reset(new browser_sync::BackupRollbackController(
+ backup_rollback_controller_.reset(new sync_driver::BackupRollbackController(
&sync_prefs_,
signin_.get(),
base::Bind(&ProfileSyncService::StartUpSlowBackendComponents,
@@ -361,7 +361,7 @@ void ProfileSyncService::Initialize() {
#endif
bool running_rollback = false;
- if (browser_sync::BackupRollbackController::IsBackupEnabled()) {
+ if (sync_driver::BackupRollbackController::IsBackupEnabled()) {
// Backup is needed if user's not signed in or signed in but previous
// backup didn't finish, i.e. backend didn't switch from backup to sync.
need_backup_ = !IsSignedIn() || sync_prefs_.GetFirstSyncTime().is_null();
@@ -2238,7 +2238,7 @@ void ProfileSyncService::GoogleSignedOut(const std::string& account_id,
sync_disabled_by_admin_ = false;
RequestStop(CLEAR_DATA);
- if (browser_sync::BackupRollbackController::IsBackupEnabled()) {
+ if (sync_driver::BackupRollbackController::IsBackupEnabled()) {
need_backup_ = true;
backup_finished_ = false;
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698