UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted.

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

 // Copyright 2014 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/ui/webui_login_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 47 matching lines @@
 const char kAccelNameKioskEnable[] = "kiosk_enable";
 const char kAccelNameVersion[] = "version";
 const char kAccelNameReset[] = "reset";
 const char kAccelFocusPrev[] = "focus_prev";
 const char kAccelFocusNext[] = "focus_next";
 const char kAccelNameDeviceRequisition[] = "device_requisition";
 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 kAccelNameShowRollbackOption[] = "show_rollback_on_reset_screen";
+const char kAccelNameHideRollbackOption[] = "hide_rollback_on_reset_screen";
 
 // A class to change arrow key traversal behavior when it's alive.
 class ScopedArrowKeyTraversal {
  public:
   explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled)
       : previous_arrow_key_traversal_enabled_(
             views::FocusManager::arrow_key_traversal_enabled()) {
     views::FocusManager::set_arrow_key_traversal_enabled(
         new_arrow_key_tranversal_enabled);
   }
@@ skipping 69 matching lines @@
       kAccelNameDeviceRequisitionShark;
 
   accel_map_[ui::Accelerator(ui::VKEY_S,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameAppLaunchBailout;
 
   accel_map_[ui::Accelerator(ui::VKEY_N,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameAppLaunchNetworkConfig;
 
+  ui::Accelerator show_rollback(ui::VKEY_MENU, ui::EF_ALT_DOWN);
+  show_rollback.set_type(ui::ET_KEY_PRESSED);
+  accel_map_[show_rollback] = kAccelNameShowRollbackOption;
+
+  ui::Accelerator hide_rollback(ui::VKEY_MENU, ui::EF_NONE);
+  hide_rollback.set_type(ui::ET_KEY_RELEASED);
+  accel_map_[hide_rollback] = kAccelNameHideRollbackOption;
+
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
     AddAccelerator(i->first);
 }
 
 WebUILoginView::~WebUILoginView() {
   FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver,
                     observer_list_,
                     OnHostDestroying());
 
   if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) {
@@ skipping 308 matching lines @@
   webui_visible_ = true;
 }
 
 void WebUILoginView::ReturnFocus(bool reverse) {
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 }  // namespace chromeos