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

Side by Side Diff: google_apis/gaia/gaia_auth_fetcher.cc

Issue 601643002: Use a distinct source parameter on gaia endpoints for the reconcilor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@uber
Patch Set: Remove functions Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « google_apis/gaia/gaia_auth_fetcher.h ('k') | google_apis/gaia/gaia_auth_fetcher_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "google_apis/gaia/gaia_auth_fetcher.h" 5 #include "google_apis/gaia/gaia_auth_fetcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 source_(source), 178 source_(source),
179 client_login_gurl_(GaiaUrls::GetInstance()->client_login_url()), 179 client_login_gurl_(GaiaUrls::GetInstance()->client_login_url()),
180 issue_auth_token_gurl_(GaiaUrls::GetInstance()->issue_auth_token_url()), 180 issue_auth_token_gurl_(GaiaUrls::GetInstance()->issue_auth_token_url()),
181 oauth2_token_gurl_(GaiaUrls::GetInstance()->oauth2_token_url()), 181 oauth2_token_gurl_(GaiaUrls::GetInstance()->oauth2_token_url()),
182 oauth2_revoke_gurl_(GaiaUrls::GetInstance()->oauth2_revoke_url()), 182 oauth2_revoke_gurl_(GaiaUrls::GetInstance()->oauth2_revoke_url()),
183 get_user_info_gurl_(GaiaUrls::GetInstance()->get_user_info_url()), 183 get_user_info_gurl_(GaiaUrls::GetInstance()->get_user_info_url()),
184 merge_session_gurl_(GaiaUrls::GetInstance()->merge_session_url()), 184 merge_session_gurl_(GaiaUrls::GetInstance()->merge_session_url()),
185 uberauth_token_gurl_(GaiaUrls::GetInstance()->oauth1_login_url().Resolve( 185 uberauth_token_gurl_(GaiaUrls::GetInstance()->oauth1_login_url().Resolve(
186 base::StringPrintf(kUberAuthTokenURLFormat, source.c_str()))), 186 base::StringPrintf(kUberAuthTokenURLFormat, source.c_str()))),
187 oauth_login_gurl_(GaiaUrls::GetInstance()->oauth1_login_url()), 187 oauth_login_gurl_(GaiaUrls::GetInstance()->oauth1_login_url()),
188 list_accounts_gurl_(GaiaUrls::GetInstance()->list_accounts_url()), 188 list_accounts_gurl_(
189 GaiaUrls::GetInstance()->ListAccountsURLWithSource(source)),
189 get_check_connection_info_url_( 190 get_check_connection_info_url_(
190 GaiaUrls::GetInstance()->get_check_connection_info_url()), 191 GaiaUrls::GetInstance()->GetCheckConnectionInfoURLWithSource(source)),
191 client_login_to_oauth2_gurl_( 192 client_login_to_oauth2_gurl_(
192 GaiaUrls::GetInstance()->client_login_to_oauth2_url()), 193 GaiaUrls::GetInstance()->client_login_to_oauth2_url()),
193 fetch_pending_(false) {} 194 fetch_pending_(false) {}
194 195
195 GaiaAuthFetcher::~GaiaAuthFetcher() {} 196 GaiaAuthFetcher::~GaiaAuthFetcher() {}
196 197
197 bool GaiaAuthFetcher::HasPendingFetch() { 198 bool GaiaAuthFetcher::HasPendingFetch() {
198 return fetch_pending_; 199 return fetch_pending_;
199 } 200 }
200 201
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 NOTREACHED(); 975 NOTREACHED();
975 } 976 }
976 } 977 }
977 978
978 // static 979 // static
979 bool GaiaAuthFetcher::IsSecondFactorSuccess( 980 bool GaiaAuthFetcher::IsSecondFactorSuccess(
980 const std::string& alleged_error) { 981 const std::string& alleged_error) {
981 return alleged_error.find(kSecondFactor) != 982 return alleged_error.find(kSecondFactor) !=
982 std::string::npos; 983 std::string::npos;
983 } 984 }
OLDNEW
« no previous file with comments | « google_apis/gaia/gaia_auth_fetcher.h ('k') | google_apis/gaia/gaia_auth_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698