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

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

Index: chrome/browser/chromeos/login/ui/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
index 42febae6d6b1cb088d26abe058069b3217ad0aee..9c203f73680a330020650cd238b204e30488eecd 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -65,6 +65,8 @@ 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 {
@@ -154,6 +156,14 @@ WebUILoginView::WebUILoginView()
                              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);
 }