| Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| index 9ab2c5be9fefa0654898d09ff3a63a6826f138aa..e8174bca1d1e97732d58b04e790a9a80fd41221e 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -1110,7 +1110,10 @@ void SigninScreenHandler::LoadAuthExtension(
|
| params.Set("localizedStrings", localized_strings);
|
| }
|
|
|
| - params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url());
|
| + std::string gaia_origin = GaiaUrls::GetInstance()->gaia_origin_url();
|
| + if (http_for_gaia_)
|
| + gaia_origin = "http" + gaia_origin.substr(arraysize("https") - 1);
|
| + params.SetString("gaiaOrigin", gaia_origin);
|
| const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(::switches::kGaiaUrlPath)) {
|
| params.SetString("gaiaUrlPath",
|
| @@ -1754,4 +1757,6 @@ bool SigninScreenHandler::IsOfflineLoginAllowed() const {
|
| return !show_pods;
|
| }
|
|
|
| +bool SigninScreenHandler::http_for_gaia_ = false;
|
| +
|
| } // namespace chromeos
|
|
|