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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 971733002: Don't use staging GAIA if --gaia-url was explicitly specified in command line (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index ace8995ccdd46eb08ad04b2c383174e6f7b78edb..b5e8a5ca79edfc3290097df3fd479fc379f3b8d7 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -246,10 +246,12 @@ void GaiaScreenHandler::LoadGaia(const GaiaContext& context) {
}
}
- if (StartupUtils::IsWebviewSigninEnabled()) {
+ if (!command_line->HasSwitch(::switches::kGaiaUrl) &&
+ StartupUtils::IsWebviewSigninEnabled()) {
// We can't use switch --gaia-url in this case cause we need get
// auth_code from staging gaia and make all the other auths against prod
// gaia so user could use all the google services.
+ // TODO(dpolukhin): crbug.com/462204
const GURL gaia_url = GURL(kStagingGaiaUrl);
params.SetString("gaiaUrl", gaia_url.spec());
} else {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698