OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" | 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
58 const char kAccelNameCancel[] = "cancel"; | 58 const char kAccelNameCancel[] = "cancel"; |
59 const char kAccelNameEnableDebugging[] = "debugging"; | 59 const char kAccelNameEnableDebugging[] = "debugging"; |
60 const char kAccelNameEnrollment[] = "enrollment"; | 60 const char kAccelNameEnrollment[] = "enrollment"; |
61 const char kAccelNameKioskEnable[] = "kiosk_enable"; | 61 const char kAccelNameKioskEnable[] = "kiosk_enable"; |
62 const char kAccelNameVersion[] = "version"; | 62 const char kAccelNameVersion[] = "version"; |
63 const char kAccelNameReset[] = "reset"; | 63 const char kAccelNameReset[] = "reset"; |
64 const char kAccelFocusPrev[] = "focus_prev"; | 64 const char kAccelFocusPrev[] = "focus_prev"; |
65 const char kAccelFocusNext[] = "focus_next"; | 65 const char kAccelFocusNext[] = "focus_next"; |
66 const char kAccelNameDeviceRequisition[] = "device_requisition"; | 66 const char kAccelNameDeviceRequisition[] = "device_requisition"; |
67 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; | 67 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; |
68 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; | |
achuithb
2015/12/02 23:18:34
What is the purpose of removing this?
| |
69 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; | 68 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; |
70 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; | 69 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; |
71 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap"; | 70 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap"; |
72 | 71 |
73 // A class to change arrow key traversal behavior when it's alive. | 72 // A class to change arrow key traversal behavior when it's alive. |
74 class ScopedArrowKeyTraversal { | 73 class ScopedArrowKeyTraversal { |
75 public: | 74 public: |
76 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) | 75 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) |
77 : previous_arrow_key_traversal_enabled_( | 76 : previous_arrow_key_traversal_enabled_( |
78 views::FocusManager::arrow_key_traversal_enabled()) { | 77 views::FocusManager::arrow_key_traversal_enabled()) { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
136 kAccelFocusPrev; | 135 kAccelFocusPrev; |
137 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] = | 136 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] = |
138 kAccelFocusNext; | 137 kAccelFocusNext; |
139 | 138 |
140 accel_map_[ui::Accelerator( | 139 accel_map_[ui::Accelerator( |
141 ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | 140 ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
142 kAccelNameDeviceRequisition; | 141 kAccelNameDeviceRequisition; |
143 accel_map_[ | 142 accel_map_[ |
144 ui::Accelerator(ui::VKEY_H, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 143 ui::Accelerator(ui::VKEY_H, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
145 kAccelNameDeviceRequisitionRemora; | 144 kAccelNameDeviceRequisitionRemora; |
146 accel_map_[ | |
147 ui::Accelerator(ui::VKEY_H, | |
148 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | |
149 kAccelNameDeviceRequisitionShark; | |
150 | 145 |
151 accel_map_[ui::Accelerator(ui::VKEY_S, | 146 accel_map_[ui::Accelerator(ui::VKEY_S, |
152 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 147 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
153 kAccelNameAppLaunchBailout; | 148 kAccelNameAppLaunchBailout; |
154 | 149 |
155 accel_map_[ui::Accelerator(ui::VKEY_N, | 150 accel_map_[ui::Accelerator(ui::VKEY_N, |
156 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 151 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
157 kAccelNameAppLaunchNetworkConfig; | 152 kAccelNameAppLaunchNetworkConfig; |
158 | 153 |
159 for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) | 154 for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
463 if (should_emit_login_prompt_visible_) { | 458 if (should_emit_login_prompt_visible_) { |
464 VLOG(1) << "Login WebUI >> login-prompt-visible"; | 459 VLOG(1) << "Login WebUI >> login-prompt-visible"; |
465 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> | 460 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> |
466 EmitLoginPromptVisible(); | 461 EmitLoginPromptVisible(); |
467 } | 462 } |
468 | 463 |
469 webui_visible_ = true; | 464 webui_visible_ = true; |
470 } | 465 } |
471 | 466 |
472 } // namespace chromeos | 467 } // namespace chromeos |
OLD | NEW |