| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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"; | 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"; | |
| 72 const char kAccelNameNewOobe[] = "new_oobe"; | 71 const char kAccelNameNewOobe[] = "new_oobe"; |
| 73 const char kAccelNameToggleWebviewSignin[] = "toggle_webview_signin"; | 72 const char kAccelNameToggleWebviewSignin[] = "toggle_webview_signin"; |
| 74 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap"; | 73 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap"; |
| 75 | 74 |
| 76 // 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. |
| 77 class ScopedArrowKeyTraversal { | 76 class ScopedArrowKeyTraversal { |
| 78 public: | 77 public: |
| 79 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) | 78 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) |
| 80 : previous_arrow_key_traversal_enabled_( | 79 : previous_arrow_key_traversal_enabled_( |
| 81 views::FocusManager::arrow_key_traversal_enabled()) { | 80 views::FocusManager::arrow_key_traversal_enabled()) { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 content::NotificationService::AllSources()); | 112 content::NotificationService::AllSources()); |
| 114 registrar_.Add(this, | 113 registrar_.Add(this, |
| 115 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN, | 114 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN, |
| 116 content::NotificationService::AllSources()); | 115 content::NotificationService::AllSources()); |
| 117 | 116 |
| 118 accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] = | 117 accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] = |
| 119 kAccelNameCancel; | 118 kAccelNameCancel; |
| 120 accel_map_[ui::Accelerator(ui::VKEY_E, | 119 accel_map_[ui::Accelerator(ui::VKEY_E, |
| 121 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 120 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
| 122 kAccelNameEnrollment; | 121 kAccelNameEnrollment; |
| 123 accel_map_[ui::Accelerator( | |
| 124 ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | |
| 125 kAccelNameEmbeddedSignin; | |
| 126 accel_map_[ui::Accelerator(ui::VKEY_K, | 122 accel_map_[ui::Accelerator(ui::VKEY_K, |
| 127 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = | 123 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = |
| 128 kAccelNameKioskEnable; | 124 kAccelNameKioskEnable; |
| 129 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = | 125 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = |
| 130 kAccelNameVersion; | 126 kAccelNameVersion; |
| 131 accel_map_[ui::Accelerator(ui::VKEY_R, | 127 accel_map_[ui::Accelerator(ui::VKEY_R, |
| 132 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = | 128 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
| 133 kAccelNameReset; | 129 kAccelNameReset; |
| 134 accel_map_[ui::Accelerator(ui::VKEY_X, | 130 accel_map_[ui::Accelerator(ui::VKEY_X, |
| 135 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)] = |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 webui_visible_ = true; | 502 webui_visible_ = true; |
| 507 } | 503 } |
| 508 | 504 |
| 509 void WebUILoginView::ReturnFocus(bool reverse) { | 505 void WebUILoginView::ReturnFocus(bool reverse) { |
| 510 // Return the focus to the web contents. | 506 // Return the focus to the web contents. |
| 511 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 507 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
| 512 GetWidget()->Activate(); | 508 GetWidget()->Activate(); |
| 513 } | 509 } |
| 514 | 510 |
| 515 } // namespace chromeos | 511 } // namespace chromeos |
| OLD | NEW |