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

Unified Diff: chrome/browser/chromeos/login/oauth2_login_manager.cc

Issue 166433005: Add URL parameter so that /ListAccounts returns valid json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos compile error Created 6 years, 10 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: 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..550eccd4e799ea485db9e6619c14a8aef696d7c1 100644
--- a/chrome/browser/chromeos/login/oauth2_login_manager.cc
+++ b/chrome/browser/chromeos/login/oauth2_login_manager.cc
@@ -292,15 +292,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;
bartfab (slow) 2014/02/17 15:22:04 Nit: #include <utility>
Roger Tawa OOO till Jul 10th 2014/02/18 19:37:54 Done.
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;
}
« no previous file with comments | « no previous file | chrome/browser/signin/account_reconcilor.h » ('j') | chrome/browser/signin/account_reconcilor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698