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

Unified Diff: ios/chrome/browser/sync/sync_setup_service.cc

Issue 1175243009: [Sync] Rename SyncEnabledAndLoggedIn() to CanStartSync(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed a const transition. Created 5 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 | « components/sync_driver/sync_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/sync/sync_setup_service.cc
diff --git a/ios/chrome/browser/sync/sync_setup_service.cc b/ios/chrome/browser/sync/sync_setup_service.cc
index ac641532aec0fbd88d24748177b8c5d9c3b9b9ff..fdbd6e4d16e366fc3eab14f426fbce128ab8e03b 100644
--- a/ios/chrome/browser/sync/sync_setup_service.cc
+++ b/ios/chrome/browser/sync/sync_setup_service.cc
@@ -104,7 +104,7 @@ void SyncSetupService::SetSyncingAllDataTypes(bool sync_all) {
}
bool SyncSetupService::IsSyncEnabled() const {
- return sync_service_->IsSyncEnabledAndLoggedIn();
+ return sync_service_->CanSyncStart();
}
void SyncSetupService::SetSyncEnabled(bool sync_enabled) {
@@ -159,7 +159,7 @@ bool SyncSetupService::HasFinishedInitialSetup() {
// 1. User is signed in with sync enabled and the sync setup was completed.
// OR
// 2. User is not signed in or has disabled sync.
- return !sync_service_->IsSyncEnabledAndLoggedIn() ||
+ return !sync_service_->CanSyncStart() ||
sync_service_->HasSyncSetupCompleted();
}
@@ -174,7 +174,7 @@ void SyncSetupService::CommitChanges() {
if (sync_service_->FirstSetupInProgress()) {
// Turn on the sync setup completed flag only if the user did not turn sync
// off.
- if (sync_service_->IsSyncEnabledAndLoggedIn()) {
+ if (sync_service_->CanSyncStart()) {
sync_service_->SetSyncSetupCompleted();
}
}
« no previous file with comments | « components/sync_driver/sync_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698