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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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"; | 68 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; |
69 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; | 69 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; |
70 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; | 70 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; |
71 const char kAccelNameEmbeddedSignin[] = "embedded_signin"; | 71 const char kAccelNameEmbeddedSignin[] = "embedded_signin"; |
72 const char kAccelNameNewOobe[] = "new_oobe"; | 72 const char kAccelNameNewOobe[] = "new_oobe"; |
| 73 const char kAccelNameToggleWebviewSignin[] = "toggle_webview_signin"; |
73 | 74 |
74 // A class to change arrow key traversal behavior when it's alive. | 75 // A class to change arrow key traversal behavior when it's alive. |
75 class ScopedArrowKeyTraversal { | 76 class ScopedArrowKeyTraversal { |
76 public: | 77 public: |
77 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) | 78 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) |
78 : previous_arrow_key_traversal_enabled_( | 79 : previous_arrow_key_traversal_enabled_( |
79 views::FocusManager::arrow_key_traversal_enabled()) { | 80 views::FocusManager::arrow_key_traversal_enabled()) { |
80 views::FocusManager::set_arrow_key_traversal_enabled( | 81 views::FocusManager::set_arrow_key_traversal_enabled( |
81 new_arrow_key_tranversal_enabled); | 82 new_arrow_key_tranversal_enabled); |
82 } | 83 } |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 126 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
126 kAccelNameKioskEnable; | 127 kAccelNameKioskEnable; |
127 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = | 128 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = |
128 kAccelNameVersion; | 129 kAccelNameVersion; |
129 accel_map_[ui::Accelerator(ui::VKEY_R, | 130 accel_map_[ui::Accelerator(ui::VKEY_R, |
130 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | 131 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
131 kAccelNameReset; | 132 kAccelNameReset; |
132 accel_map_[ui::Accelerator(ui::VKEY_X, | 133 accel_map_[ui::Accelerator(ui::VKEY_X, |
133 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | 134 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
134 kAccelNameEnableDebugging; | 135 kAccelNameEnableDebugging; |
| 136 accel_map_[ui::Accelerator(ui::VKEY_W, |
| 137 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
| 138 kAccelNameToggleWebviewSignin; |
135 | 139 |
136 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] = | 140 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] = |
137 kAccelFocusPrev; | 141 kAccelFocusPrev; |
138 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] = | 142 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] = |
139 kAccelFocusNext; | 143 kAccelFocusNext; |
140 | 144 |
141 // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key. | 145 // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key. |
142 ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE); | 146 ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE); |
143 key_up.set_type(ui::ET_KEY_RELEASED); | 147 key_up.set_type(ui::ET_KEY_RELEASED); |
144 ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE); | 148 ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE); |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 webui_visible_ = true; | 510 webui_visible_ = true; |
507 } | 511 } |
508 | 512 |
509 void WebUILoginView::ReturnFocus(bool reverse) { | 513 void WebUILoginView::ReturnFocus(bool reverse) { |
510 // Return the focus to the web contents. | 514 // Return the focus to the web contents. |
511 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 515 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
512 GetWidget()->Activate(); | 516 GetWidget()->Activate(); |
513 } | 517 } |
514 | 518 |
515 } // namespace chromeos | 519 } // namespace chromeos |
OLD | NEW |