OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/webui_login_view.h" | 5 #include "chrome/browser/chromeos/login/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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 const char kAccelNameCancel[] = "cancel"; | 54 const char kAccelNameCancel[] = "cancel"; |
55 const char kAccelNameEnrollment[] = "enrollment"; | 55 const char kAccelNameEnrollment[] = "enrollment"; |
56 const char kAccelNameKioskEnable[] = "kiosk_enable"; | 56 const char kAccelNameKioskEnable[] = "kiosk_enable"; |
57 const char kAccelNameVersion[] = "version"; | 57 const char kAccelNameVersion[] = "version"; |
58 const char kAccelNameReset[] = "reset"; | 58 const char kAccelNameReset[] = "reset"; |
59 const char kAccelFocusPrev[] = "focus_prev"; | 59 const char kAccelFocusPrev[] = "focus_prev"; |
60 const char kAccelFocusNext[] = "focus_next"; | 60 const char kAccelFocusNext[] = "focus_next"; |
61 const char kAccelNameDeviceRequisition[] = "device_requisition"; | 61 const char kAccelNameDeviceRequisition[] = "device_requisition"; |
62 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; | 62 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; |
63 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; | 63 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; |
| 64 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; |
64 | 65 |
65 // A class to change arrow key traversal behavior when it's alive. | 66 // A class to change arrow key traversal behavior when it's alive. |
66 class ScopedArrowKeyTraversal { | 67 class ScopedArrowKeyTraversal { |
67 public: | 68 public: |
68 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) | 69 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) |
69 : previous_arrow_key_traversal_enabled_( | 70 : previous_arrow_key_traversal_enabled_( |
70 views::FocusManager::arrow_key_traversal_enabled()) { | 71 views::FocusManager::arrow_key_traversal_enabled()) { |
71 views::FocusManager::set_arrow_key_traversal_enabled( | 72 views::FocusManager::set_arrow_key_traversal_enabled( |
72 new_arrow_key_tranversal_enabled); | 73 new_arrow_key_tranversal_enabled); |
73 } | 74 } |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | 136 ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
136 kAccelNameDeviceRequisition; | 137 kAccelNameDeviceRequisition; |
137 accel_map_[ | 138 accel_map_[ |
138 ui::Accelerator(ui::VKEY_H, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 139 ui::Accelerator(ui::VKEY_H, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
139 kAccelNameDeviceRequisitionRemora; | 140 kAccelNameDeviceRequisitionRemora; |
140 | 141 |
141 accel_map_[ui::Accelerator(ui::VKEY_S, | 142 accel_map_[ui::Accelerator(ui::VKEY_S, |
142 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 143 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
143 kAccelNameAppLaunchBailout; | 144 kAccelNameAppLaunchBailout; |
144 | 145 |
| 146 accel_map_[ui::Accelerator(ui::VKEY_N, |
| 147 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
| 148 kAccelNameAppLaunchNetworkConfig; |
| 149 |
145 for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) | 150 for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i) |
146 AddAccelerator(i->first); | 151 AddAccelerator(i->first); |
147 } | 152 } |
148 | 153 |
149 WebUILoginView::~WebUILoginView() { | 154 WebUILoginView::~WebUILoginView() { |
150 FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver, | 155 FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver, |
151 observer_list_, | 156 observer_list_, |
152 OnHostDestroying()); | 157 OnHostDestroying()); |
153 | 158 |
154 if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) { | 159 if (ash::Shell::GetInstance()->HasPrimaryStatusArea()) { |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 webui_visible_ = true; | 449 webui_visible_ = true; |
445 } | 450 } |
446 | 451 |
447 void WebUILoginView::ReturnFocus(bool reverse) { | 452 void WebUILoginView::ReturnFocus(bool reverse) { |
448 // Return the focus to the web contents. | 453 // Return the focus to the web contents. |
449 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 454 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
450 GetWidget()->Activate(); | 455 GetWidget()->Activate(); |
451 } | 456 } |
452 | 457 |
453 } // namespace chromeos | 458 } // namespace chromeos |
OLD | NEW |