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

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

Issue 1094103005: Profile chooser on mac was passing wrong value to signin error controller. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ASI Created 5 years, 8 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/signin_error_controller.cc
diff --git a/components/signin/core/browser/signin_error_controller.cc b/components/signin/core/browser/signin_error_controller.cc
index 2d35e85209672d342f4ebf38da09d7f801588ffb..da5cc55bd3fb24beacb2a6495e49aa3313a18405 100644
--- a/components/signin/core/browser/signin_error_controller.cc
+++ b/components/signin/core/browser/signin_error_controller.cc
@@ -4,6 +4,7 @@
#include "components/signin/core/browser/signin_error_controller.h"
+#include "components/signin/core/browser/account_tracker_service.h"
Mike Lerman 2015/04/24 19:36:27 Is this include necessary?
Roger Tawa OOO till Jul 10th 2015/04/27 20:32:00 Oops, left over from old code. Removed.
#include "components/signin/core/browser/signin_metrics.h"
namespace {
@@ -64,13 +65,11 @@ void SigninErrorController::AuthStatusChanged() {
}
std::string account_id = (*it)->GetAccountId();
- std::string username = (*it)->GetUsername();
// Prioritize this error if it matches the previous |auth_error_|.
if (error.state() == prev_state && account_id == prev_account_id) {
auth_error_ = error;
error_account_id_ = account_id;
- error_username_ = username;
error_changed = true;
break;
}
@@ -80,7 +79,6 @@ void SigninErrorController::AuthStatusChanged() {
if (!error_changed) {
auth_error_ = error;
error_account_id_ = account_id;
- error_username_ = username;
error_changed = true;
}
}
@@ -89,7 +87,6 @@ void SigninErrorController::AuthStatusChanged() {
// No provider reported an error, so clear the error we have now.
auth_error_ = GoogleServiceAuthError::AuthErrorNone();
error_account_id_.clear();
- error_username_.clear();
error_changed = true;
}

Powered by Google App Engine
This is Rietveld 408576698