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

Unified Diff: chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 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: chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc
diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc
index 6b7232ed00587a25d0e687e6a6a903595793af4a..d97fca421a354df4ef0c68eb321a3e3e70f60625 100644
--- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc
+++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc
@@ -55,7 +55,7 @@ GaiaWebAuthFlow::GaiaWebAuthFlow(Delegate* delegate,
std::vector<std::string> client_id_parts;
base::SplitString(oauth2_client_id, '.', &client_id_parts);
std::reverse(client_id_parts.begin(), client_id_parts.end());
- redirect_scheme_ = JoinString(client_id_parts, '.');
+ redirect_scheme_ = base::JoinString(client_id_parts, ".");
std::string signin_scoped_device_id;
// profile_ can be nullptr in unittests.
SigninClient* signin_client =
@@ -69,7 +69,7 @@ GaiaWebAuthFlow::GaiaWebAuthFlow(Delegate* delegate,
std::string oauth2_authorize_params = base::StringPrintf(
kOAuth2AuthorizeFormat,
oauth2_client_id.c_str(),
- net::EscapeUrlEncodedData(JoinString(scopes, ' '), true).c_str(),
+ net::EscapeUrlEncodedData(base::JoinString(scopes, " "), true).c_str(),
token_key->extension_id.c_str(),
redirect_scheme_.c_str(),
token_key->extension_id.c_str(),

Powered by Google App Engine
This is Rietveld 408576698