Revert of kiosk: Fix bailout shortcut not working.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 827 matching lines @@
     return;
   }
 
   // The user chose a locale and a suitable keyboard layout or left both unset.
   // Login can continue immediately.
   LoginAsPublicSessionInternal(new_user_context);
 }
 
 void ExistingUserController::LoginAsKioskApp(const std::string& app_id,
                                              bool diagnostic_mode) {
-  // Reenable login display so that bailout shortcut key works.
-  login_display_->SetUIEnabled(true);
-
   const bool auto_start = false;
   host_->StartAppLaunch(app_id, diagnostic_mode, auto_start);
 }
 
 void ExistingUserController::ConfigurePublicSessionAutoLogin() {
   std::string auto_login_account_id;
   cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
                             &auto_login_account_id);
   const std::vector<policy::DeviceLocalAccount> device_local_accounts =
       policy::GetDeviceLocalAccounts(cros_settings_);
@@ skipping 302 matching lines @@
     login_display_->SetUIEnabled(true);
     // Restart the auto-login timer.
     StartPublicSessionAutoLoginTimer();
   }
 
   PerformPreLoginActions(user_context);
   PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL);
 }
 
 }  // namespace chromeos