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

Unified Diff: components/signin/core/browser/account_reconcilor.cc

Issue 372033002: Change semantics of newProfileManagement() to accountConsistency() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
Index: components/signin/core/browser/account_reconcilor.cc
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
index 7964d36d4bd4c1d6154e542f1d7382c03d1ec4ea..d120a582a73381e2e9e581e585c7f242bcd76b41 100644
--- a/components/signin/core/browser/account_reconcilor.cc
+++ b/components/signin/core/browser/account_reconcilor.cc
@@ -362,7 +362,7 @@ void AccountReconcilor::GoogleSignedOut(const std::string& username) {
}
void AccountReconcilor::PerformMergeAction(const std::string& account_id) {
- if (!switches::IsNewProfileManagement()) {
+ if (!switches::IsEnableAccountConsistency()) {
MarkAccountAsAddedToCookie(account_id);
return;
}
@@ -383,7 +383,7 @@ void AccountReconcilor::PerformFinishRemoveAction(
const std::string& account_id,
const GoogleServiceAuthError& error,
const std::vector<std::pair<std::string, bool> >& accounts) {
- if (!switches::IsNewProfileManagement())
+ if (!switches::IsEnableAccountConsistency())
return;
VLOG(1) << "AccountReconcilor::PerformFinishRemoveAction:"
<< " account=" << account_id << " error=" << error.ToString();
@@ -405,7 +405,7 @@ void AccountReconcilor::PerformAddToChromeAction(
const std::string& account_id,
int session_index,
const std::string& signin_scoped_device_id) {
- if (!switches::IsNewProfileManagement()) {
+ if (!switches::IsEnableAccountConsistency()) {
MarkAccountAsAddedToChrome(account_id);
return;
}
@@ -419,7 +419,7 @@ void AccountReconcilor::PerformAddToChromeAction(
}
void AccountReconcilor::PerformLogoutAllAccountsAction() {
- if (!switches::IsNewProfileManagement())
+ if (!switches::IsEnableAccountConsistency())
return;
VLOG(1) << "AccountReconcilor::PerformLogoutAllAccountsAction";
merge_session_helper_.LogOutAllAccounts();
@@ -762,7 +762,7 @@ void AccountReconcilor::PerformAddAccountToTokenService(
const std::string& refresh_token) {
// The flow should never get to this method if new_profile_management is
// false, but better safe than sorry.
- if (!switches::IsNewProfileManagement())
+ if (!switches::IsEnableAccountConsistency())
return;
token_service_->UpdateCredentials(account_id, refresh_token);
}

Powered by Google App Engine
This is Rietveld 408576698