[cleanup] Removed embedded sign-in support code from OOBE.

We are not going to use 'EmbeddedSignIn' endpoint for OOBE, so this code
could be safely removed.

BUG=468439
TEST=manually

Review URL: https://codereview.chromium.org/1018133002

Cr-Commit-Position: refs/heads/master@{#321355}

chrome/browser/chromeos/login/ui/webui_login_view.cc

@@ -68,7 +68,6 @@ const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora";
 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark";
 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout";
 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config";
-const char kAccelNameEmbeddedSignin[] = "embedded_signin";
 const char kAccelNameNewOobe[] = "new_oobe";
 const char kAccelNameToggleWebviewSignin[] = "toggle_webview_signin";
 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap";
@@ -120,9 +119,6 @@ WebUILoginView::WebUILoginView()
   accel_map_[ui::Accelerator(ui::VKEY_E,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameEnrollment;
-  accel_map_[ui::Accelerator(
-      ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
-      kAccelNameEmbeddedSignin;
   accel_map_[ui::Accelerator(ui::VKEY_K,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameKioskEnable;

chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

@@ -32,12 +32,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
      */
     currentStep_: null,
 
-    /**
-     * Opaque token used to correlate request and response while retrieving the
-     * authenticated user's e-mail address from GAIA.
-     */
-    attemptToken_: null,
-
     /**
      * The help topic to show when the user clicks the learn more link.
      */

chrome/browser/resources/chromeos/login/screen_gaia_signin.js

@@ -22,8 +22,7 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
       'updateAuthExtension',
       'doReload',
       'onFrameError',
-      'updateCancelButtonState',
-      'switchToFullTab'
+      'updateCancelButtonState'
     ],
 
     /**
@@ -315,7 +314,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
         if (data.enterpriseDomain)
           params.enterpriseDomain = data.enterpriseDomain;
         params.chromeType = data.chromeType;
-        data.useEmbedded = false;
         params.isMinuteMaidChromeOS = true;
         $('login-header-bar').showGuestButton = true;
       }
@@ -325,9 +323,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
 
       $('login-header-bar').minuteMaid = this.isMinuteMaid;
 
-      if (data.useEmbedded)
-        params.gaiaPath = 'EmbeddedSignIn';
-
       if (data.forceReload ||
           JSON.stringify(this.gaiaAuthParams_) != JSON.stringify(params)) {
         this.error_ = 0;
@@ -335,8 +330,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
         var authMode = cr.login.GaiaAuthHost.AuthMode.DEFAULT;
         if (data.useOffline)
           authMode = cr.login.GaiaAuthHost.AuthMode.OFFLINE;
-        else if (data.useEmbedded)
-          authMode = cr.login.GaiaAuthHost.AuthMode.DESKTOP;
 
         this.gaiaAuthHost_.load(authMode,
                                 params,
@@ -413,11 +406,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
         $('close-button-item').hidden = !this.cancelAllowed_;
     },
 
-    switchToFullTab: function() {
-      this.classList.toggle('no-right-panel', true);
-      this.classList.toggle('full-width', true);
-    },
-
     /**
      * Whether the current auth flow is SAML.
      */

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

@@ -175,7 +175,6 @@ GaiaScreenHandler::GaiaScreenHandler(
       using_saml_api_(false),
       is_enrolling_consumer_management_(false),
       test_expects_complete_login_(false),
-      embedded_signin_enabled_by_shortcut_(false),
       use_easy_bootstrap_(false),
       signin_screen_handler_(NULL),
       weak_factory_(this) {
@@ -278,12 +277,6 @@ void GaiaScreenHandler::LoadGaia(const GaiaContext& context) {
     params.SetString("gaiaEndpoint", command_line->GetSwitchValueASCII(
                                          switches::kGaiaEndpointChromeOS));
   }
-  if (context.embedded_signin_enabled) {
-    params.SetBoolean("useEmbedded", true);
-    // We set 'constrained' here to switch troubleshooting page on embedded
-    // signin to full tab.
-    params.SetInteger("constrained", 1);
-  }
 
   if (use_easy_bootstrap_) {
     params.SetBoolean("useEafe", true);
@@ -328,22 +321,6 @@ 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 /* force */, true /* silent_load */, false /* offline */);
-}
-
-void GaiaScreenHandler::CancelEmbeddedSignin() {
-  embedded_signin_enabled_by_shortcut_ = false;
-}
-
 void GaiaScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE);
@@ -393,7 +370,6 @@ void GaiaScreenHandler::RegisterMessages() {
   AddCallback("scrapedPasswordVerificationFailed",
               &GaiaScreenHandler::HandleScrapedPasswordVerificationFailed);
   AddCallback("loginWebuiReady", &GaiaScreenHandler::HandleGaiaUIReady);
-  AddCallback("switchToFullTab", &GaiaScreenHandler::HandleSwitchToFullTab);
   AddCallback("toggleWebviewSignin",
               &GaiaScreenHandler::HandleToggleWebviewSignin);
   AddCallback("toggleEasyBootstrap",
@@ -505,10 +481,6 @@ void GaiaScreenHandler::HandleScrapedPasswordVerificationFailed() {
   RecordSAMLScrapingVerificationResultInHistogram(false);
 }
 
-void GaiaScreenHandler::HandleSwitchToFullTab() {
-  CallJS("switchToFullTab");
-}
-
 void GaiaScreenHandler::HandleToggleWebviewSignin() {
   if (StartupUtils::EnableWebviewSignin(
         !StartupUtils::IsWebviewSigninEnabled())) {
@@ -836,11 +808,6 @@ void GaiaScreenHandler::LoadAuthExtension(bool force,
     context.has_users = !Delegate()->GetUsers().empty();
   }
 
-  context.embedded_signin_enabled =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kEnableEmbeddedSignin) ||
-      embedded_signin_enabled_by_shortcut_;
-
   populated_email_.clear();
 
   LoadGaia(context);

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

@@ -52,9 +52,6 @@ struct GaiaContext {
 
   // Whether consumer management enrollment is in progress.
   bool is_enrolling_consumer_management;
-
-  // True if embedded_signin is enabled.
-  bool embedded_signin_enabled;
 };
 
 // A class that handles WebUI hooks in Gaia screen.
@@ -81,12 +78,6 @@ class GaiaScreenHandler : public BaseScreenHandler {
   // not loading right now.
   void ReloadGaia(bool force_reload);
 
-  // Reload gaia with embedded signin frame.
-  void SwitchToEmbeddedSignin();
-
-  // Cancel embedded signin for the next load.
-  void CancelEmbeddedSignin();
-
   // Decides whether an auth extension should be pre-loaded. If it should,
   // pre-loads it.
   void MaybePreloadAuthExtension();
@@ -125,7 +116,6 @@ class GaiaScreenHandler : public BaseScreenHandler {
 
   void HandleGaiaUIReady();
 
-  void HandleSwitchToFullTab();
   void HandleToggleEasyBootstrap();
 
   void HandleToggleWebviewSignin();
@@ -251,9 +241,6 @@ class GaiaScreenHandler : public BaseScreenHandler {
   std::string test_pass_;
   bool test_expects_complete_login_;
 
-  // True if user pressed shortcut to enable embedded signin.
-  bool embedded_signin_enabled_by_shortcut_;
-
   // True if Easy bootstrap is enabled.
   bool use_easy_bootstrap_;
 

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -461,8 +461,6 @@ void SigninScreenHandler::RegisterMessages() {
               &SigninScreenHandler::HandleToggleEnrollmentScreen);
   AddCallback("toggleEnableDebuggingScreen",
               &SigninScreenHandler::HandleToggleEnableDebuggingScreen);
-  AddCallback("switchToEmbeddedSignin",
-              &SigninScreenHandler::HandleSwitchToEmbeddedSignin);
   AddCallback("toggleKioskEnableScreen",
               &SigninScreenHandler::HandleToggleKioskEnableScreen);
   AddCallback("createAccount", &SigninScreenHandler::HandleCreateAccount);
@@ -1178,13 +1176,10 @@ void SigninScreenHandler::HandleResyncUserData() {
 }
 
 void SigninScreenHandler::HandleLoginUIStateChanged(const std::string& source,
-                                                    bool new_value) {
-  VLOG(0) << "Login WebUI >> active: " << new_value << ", "
+                                                    bool active) {
+  VLOG(0) << "Login WebUI >> active: " << active << ", "
             << "source: " << source;
 
-  if (source == "gaia-signin" && !new_value)
-    gaia_screen_handler_->CancelEmbeddedSignin();
-
   if (!KioskAppManager::Get()->GetAutoLaunchApp().empty() &&
       KioskAppManager::Get()->IsAutoLaunchRequested()) {
     VLOG(0) << "Showing auto-launch warning";
@@ -1276,10 +1271,6 @@ void SigninScreenHandler::HandleGetTouchViewState() {
   }
 }
 
-void SigninScreenHandler::HandleSwitchToEmbeddedSignin() {
-  gaia_screen_handler_->SwitchToEmbeddedSignin();
-}
-
 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

@@ -346,7 +346,7 @@ class SigninScreenHandler
   void HandleCancelUserAdding();
   void HandleMigrateUserData(const std::string& password);
   void HandleResyncUserData();
-  void HandleLoginUIStateChanged(const std::string& source, bool new_value);
+  void HandleLoginUIStateChanged(const std::string& source, bool active);
   void HandleUnlockOnLoginSuccess();
   void HandleLoginScreenUpdate();
   void HandleShowLoadingTimeoutError();
@@ -359,7 +359,6 @@ class SigninScreenHandler
                                              const std::string& locale);
   void HandleCancelConsumerManagementEnrollment();
   void HandleGetTouchViewState();
-  void HandleSwitchToEmbeddedSignin();
 
   // Sends the list of |keyboard_layouts| available for the |locale| that is
   // currently selected for the public session identified by |user_id|.

chromeos/chromeos_switches.cc

@@ -112,10 +112,6 @@ const char kEnableConsumerManagement[] = "enable-consumer-management";
 // If this switch is set, the device cannot be remotely disabled by its owner.
 const char kDisableDeviceDisabling[] = "disable-device-disabling";
 
-// If this switch is set, Chrome OS login screen uses |EmbeddedSignin| endpoint
-// of GAIA.
-const char kEnableEmbeddedSignin[] = "enable-embedded-signin";
-
 // If this switch is set, the new Korean IME will be available in
 // chrome://settings/languages.
 const char kEnableNewKoreanIme[] = "enable-new-korean-ime";

chromeos/chromeos_switches.h

@@ -57,7 +57,6 @@ CHROMEOS_EXPORT extern const char kEafeUrl[];
 CHROMEOS_EXPORT extern const char kEafePath[];
 CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
 CHROMEOS_EXPORT extern const char kEnableConsumerManagement[];
-CHROMEOS_EXPORT extern const char kEnableEmbeddedSignin[];
 CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[];
 CHROMEOS_EXPORT extern const char kEnableFirewallHolePunching[];
 CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];

ui/login/display_manager.js

@@ -50,7 +50,6 @@
 /** @const */ var ACCELERATOR_APP_LAUNCH_BAILOUT = 'app_launch_bailout';
 /** @const */ var ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG =
     'app_launch_network_config';
-/** @const */ var ACCELERATOR_EMBEDDED_SIGNIN = 'embedded_signin';
 /** @const */ var ACCELERATOR_NEW_OOBE = 'new_oobe';
 /** @const */ var ACCELERATOR_TOGGLE_WEBVIEW_SIGNIN = 'toggle_webview_signin';
 
@@ -403,9 +402,6 @@ cr.define('cr.ui.login', function() {
       } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) {
         if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
           chrome.send('networkConfigRequest');
-      } else if (name == ACCELERATOR_EMBEDDED_SIGNIN) {
-        if (currentStepId == SCREEN_GAIA_SIGNIN)
-          chrome.send('switchToEmbeddedSignin');
       } else if (name == ACCELERATOR_NEW_OOBE) {
         chrome.send('switchToNewOobe');
       } else if (name == ACCELERATOR_TOGGLE_WEBVIEW_SIGNIN) {