Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 609803002: UI rework for reset options including Rollback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Strings and views nits. Rollback view is unset on screen cancel. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9fac03aaf1b8b84fa7077de50b7b3dbce070265b..543fbc588d808f16621892e4dee93cfb50e1bae1 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -66,8 +66,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 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 {
@@ -157,14 +155,6 @@ 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);
}
« no previous file with comments | « chrome/browser/chromeos/login/reset_browsertest.cc ('k') | chrome/browser/resources/chromeos/login/login_common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698