Chromium Code Reviews| 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 dab8ff042c36d1413eed71e78f28c50566e527ba..3d1f73f8bc4a0eedaa7e8f124cce96bdbb527914 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
| +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
| @@ -21,6 +21,7 @@ |
| #include "chrome/browser/io_thread.h" |
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| #include "chrome/browser/ui/webui/signin/inline_login_ui.h" |
| +#include "chrome/common/chrome_version_info.h" |
| #include "chrome/common/pref_names.h" |
| #include "chrome/grit/generated_resources.h" |
| #include "chromeos/chromeos_switches.h" |
| @@ -146,6 +147,7 @@ GaiaScreenHandler::GaiaScreenHandler( |
| using_saml_api_(false), |
| is_enrolling_consumer_management_(false), |
| test_expects_complete_login_(false), |
| + embedded_signin_enabled_by_shortcut_(false), |
| signin_screen_handler_(NULL), |
| weak_factory_(this) { |
| DCHECK(network_state_informer_.get()); |
| @@ -204,7 +206,8 @@ void GaiaScreenHandler::LoadGaia(const GaiaContext& context) { |
| : GaiaUrls::GetInstance()->gaia_url(); |
| params.SetString("gaiaUrl", gaia_url.spec()); |
| - if (command_line->HasSwitch(chromeos::switches::kEnableEmbeddedSignin)) |
| + if (command_line->HasSwitch(chromeos::switches::kEnableEmbeddedSignin) || |
| + embedded_signin_enabled_by_shortcut_) |
| params.SetBoolean("useEmbedded", true); |
| frame_state_ = FRAME_STATE_LOADING; |
| @@ -234,6 +237,18 @@ void GaiaScreenHandler::ReloadGaia(bool force_reload) { |
| CallJS("doReload"); |
| } |
| +void GaiaScreenHandler::SwitchToEmbeddedSignin() { |
| + // This feature should not be working on Stable,Beta images. |
| + chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
| + if (channel == chrome::VersionInfo::CHANNEL_STABLE || |
| + channel == chrome::VersionInfo::CHANNEL_BETA) { |
| + return; |
| + } |
| + embedded_signin_enabled_by_shortcut_ = true; |
| + LoadAuthExtension(true, true, false); |
| + embedded_signin_enabled_by_shortcut_ = false; |
|
Nikita (slow)
2014/10/10 10:56:28
I suggest clearing this flag only when user explic
Roman Sorokin (ftl)
2014/10/10 12:19:32
Done.
|
| +} |
| + |
| void GaiaScreenHandler::DeclareLocalizedValues( |
| LocalizedValuesBuilder* builder) { |
| builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE); |