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

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: Fix profile_chooser_controller_test 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 a47a9ee57648ed9680013f7cb499494566b8b6c0..154c54bfa24b0bb47aac8d269a7f58439ba19658 100644
--- a/components/signin/core/browser/account_reconcilor.cc
+++ b/components/signin/core/browser/account_reconcilor.cc
@@ -360,7 +360,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;
}
@@ -381,7 +381,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();
@@ -403,7 +403,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;
}
@@ -417,7 +417,7 @@ void AccountReconcilor::PerformAddToChromeAction(
}
void AccountReconcilor::PerformLogoutAllAccountsAction() {
- if (!switches::IsNewProfileManagement())
+ if (!switches::IsEnableAccountConsistency())
return;
VLOG(1) << "AccountReconcilor::PerformLogoutAllAccountsAction";
merge_session_helper_.LogOutAllAccounts();
@@ -763,7 +763,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);
}
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | components/signin/core/common/profile_management_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698