Implement kiosk splash screen bailout shortcut

Bug: 836861
Change-Id: I6ac30f0e187750b55cd7f14bd39f5d477497c003
Reviewed-on: https://chromium-review.googlesource.com/1109208
Commit-Queue: Quan Nguyen <qnnguyen@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569760}

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

@@ -26,6 +26,7 @@ namespace {
 constexpr char kGaiaURL[] = "chrome://oobe/gaia-signin";
 constexpr int kGaiaDialogHeight = 640;
 constexpr int kGaiaDialogWidth = 768;
+constexpr char kAppLaunchBailout[] = "app_launch_bailout";
 
 }  // namespace
 
@@ -37,6 +38,8 @@ OobeUIDialogDelegate::OobeUIDialogDelegate(
       tablet_mode_observer_(this) {
   display_observer_.Add(display::Screen::GetScreen());
   tablet_mode_observer_.Add(TabletModeClient::Get());
+  accel_map_[ui::Accelerator(
+      ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = kAppLaunchBailout;
 }
 
 OobeUIDialogDelegate::~OobeUIDialogDelegate() {
@@ -188,7 +191,12 @@ bool OobeUIDialogDelegate::HandleContextMenu(
 
 std::vector<ui::Accelerator> OobeUIDialogDelegate::GetAccelerators() {
   // TODO(crbug.com/809648): Adding necessory accelerators.
-  return std::vector<ui::Accelerator>();
+  std::vector<ui::Accelerator> output;
+
+  for (const auto& pair : accel_map_)
+    output.push_back(pair.first);
+
+  return output;
 }
 
 bool OobeUIDialogDelegate::AcceleratorPressed(
@@ -202,7 +210,12 @@ bool OobeUIDialogDelegate::AcceleratorPressed(
     return true;
   }
 
-  return false;
+  auto entry = accel_map_.find(accelerator);
+  if (entry == accel_map_.end())
+    return false;
+
+  GetOobeUI()->ForwardAccelerator(entry->second);
+  return true;
 }
 
 }  // namespace chromeos

chrome/browser/chromeos/login/ui/oobe_ui_dialog_delegate.h

@@ -114,6 +114,8 @@ class OobeUIDialogDelegate : public display::DisplayObserver,
   ScopedObserver<TabletModeClient, TabletModeClientObserver>
       tablet_mode_observer_;
 
+  std::map<ui::Accelerator, std::string> accel_map_;
+
   DISALLOW_COPY_AND_ASSIGN(OobeUIDialogDelegate);
 };
 

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

@@ -297,6 +297,7 @@ void CoreOobeHandler::SetClientAreaSize(int width, int height) {
 void CoreOobeHandler::HandleInitialized() {
   ExecuteDeferredJSCalls();
   oobe_ui_->InitializeHandlers();
+  AllowJavascript();
 }
 
 void CoreOobeHandler::HandleSkipUpdateEnrollAfterEula() {
@@ -441,6 +442,10 @@ void CoreOobeHandler::SetLoginUserCount(int user_count) {
   CallJSOrDefer("setLoginUserCount", user_count);
 }
 
+void CoreOobeHandler::ForwardAccelerator(std::string accelerator_name) {
+  CallJSOrDefer("handleAccelerator", accelerator_name);
+}
+
 void CoreOobeHandler::UpdateA11yState() {
   if (!features::IsAshInBrowserProcess()) {
     NOTIMPLEMENTED();

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

@@ -80,6 +80,9 @@ class CoreOobeHandler : public BaseWebUIHandler,
   // Notify WebUI of the user count on the views login screen.
   void SetLoginUserCount(int user_count);
 
+  // Forwards an accelerator value to cr.ui.Oobe.handleAccelerator.
+  void ForwardAccelerator(std::string accelerator_name);
+
  private:
   // CoreOobeView implementation:
   void ShowSignInError(int login_attempts,

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

@@ -669,6 +669,10 @@ void OobeUI::ShowSigninScreen(const LoginScreenContext& context,
   signin_screen_handler_->Show(actual_context);
 }
 
+void OobeUI::ForwardAccelerator(std::string accelerator_name) {
+  core_handler_->ForwardAccelerator(accelerator_name);
+}
+
 void OobeUI::ResetSigninScreenHandlerDelegate() {
   signin_screen_handler_->SetDelegate(nullptr);
   signin_screen_handler_->SetNativeWindowDelegate(nullptr);

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

@@ -161,6 +161,9 @@ class OobeUI : public content::WebUIController,
                         SigninScreenHandlerDelegate* delegate,
                         NativeWindowDelegate* native_window_delegate);
 
+  // Forwards an accelerator to the webui to be handled.
+  void ForwardAccelerator(std::string accelerator_name);
+
   // Resets the delegate set in ShowSigninScreen.
   void ResetSigninScreenHandlerDelegate();