Index: chrome/browser/chromeos/login/oauth2_login_manager.cc |
diff --git a/chrome/browser/chromeos/login/oauth2_login_manager.cc b/chrome/browser/chromeos/login/oauth2_login_manager.cc |
index 820d117fd620aa1133ce60ab99db85b9805e9f90..07f841fc75c58cc32696390a8ca3ddf5f9826f4f 100644 |
--- a/chrome/browser/chromeos/login/oauth2_login_manager.cc |
+++ b/chrome/browser/chromeos/login/oauth2_login_manager.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/chromeos/login/oauth2_login_manager.h" |
+#include <utility> |
#include <vector> |
#include "base/command_line.h" |
@@ -292,15 +293,16 @@ void OAuth2LoginManager::OnSessionMergeFailure(bool connection_error) { |
void OAuth2LoginManager::OnListAccountsSuccess(const std::string& data) { |
MergeVerificationOutcome outcome = POST_MERGE_SUCCESS; |
// Let's analyze which accounts we see logged in here: |
- std::vector<std::string> accounts; |
+ std::vector<std::pair<std::string, bool> > accounts; |
gaia::ParseListAccountsData(data, &accounts); |
std::string user_email = gaia::CanonicalizeEmail(GetPrimaryAccountId()); |
if (!accounts.empty()) { |
bool found = false; |
bool first = true; |
- for (std::vector<std::string>::const_iterator iter = accounts.begin(); |
+ for (std::vector<std::pair<std::string, bool> >::const_iterator iter = |
+ accounts.begin(); |
iter != accounts.end(); ++iter) { |
- if (gaia::CanonicalizeEmail(*iter) == user_email) { |
+ if (gaia::CanonicalizeEmail(iter->first) == user_email) { |
found = true; |
break; |
} |