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

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 645003002: Added keyboard shortcut on GAIA "Add User" screen to dogfood GAIA /EmbeddedSignin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 const char kAccelNameKioskEnable[] = "kiosk_enable"; 59 const char kAccelNameKioskEnable[] = "kiosk_enable";
60 const char kAccelNameVersion[] = "version"; 60 const char kAccelNameVersion[] = "version";
61 const char kAccelNameReset[] = "reset"; 61 const char kAccelNameReset[] = "reset";
62 const char kAccelFocusPrev[] = "focus_prev"; 62 const char kAccelFocusPrev[] = "focus_prev";
63 const char kAccelFocusNext[] = "focus_next"; 63 const char kAccelFocusNext[] = "focus_next";
64 const char kAccelNameDeviceRequisition[] = "device_requisition"; 64 const char kAccelNameDeviceRequisition[] = "device_requisition";
65 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; 65 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora";
66 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; 66 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark";
67 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; 67 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout";
68 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; 68 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config";
69 const char kAccelNameEmbeddedSignin[] = "embedded_signin";
69 70
70 // A class to change arrow key traversal behavior when it's alive. 71 // A class to change arrow key traversal behavior when it's alive.
71 class ScopedArrowKeyTraversal { 72 class ScopedArrowKeyTraversal {
72 public: 73 public:
73 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled) 74 explicit ScopedArrowKeyTraversal(bool new_arrow_key_tranversal_enabled)
74 : previous_arrow_key_traversal_enabled_( 75 : previous_arrow_key_traversal_enabled_(
75 views::FocusManager::arrow_key_traversal_enabled()) { 76 views::FocusManager::arrow_key_traversal_enabled()) {
76 views::FocusManager::set_arrow_key_traversal_enabled( 77 views::FocusManager::set_arrow_key_traversal_enabled(
77 new_arrow_key_tranversal_enabled); 78 new_arrow_key_tranversal_enabled);
78 } 79 }
(...skipping 28 matching lines...) Expand all
107 content::NotificationService::AllSources()); 108 content::NotificationService::AllSources());
108 registrar_.Add(this, 109 registrar_.Add(this,
109 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN, 110 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
110 content::NotificationService::AllSources()); 111 content::NotificationService::AllSources());
111 112
112 accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] = 113 accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] =
113 kAccelNameCancel; 114 kAccelNameCancel;
114 accel_map_[ui::Accelerator(ui::VKEY_E, 115 accel_map_[ui::Accelerator(ui::VKEY_E,
115 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 116 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
116 kAccelNameEnrollment; 117 kAccelNameEnrollment;
118 accel_map_[ui::Accelerator(
119 ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
120 kAccelNameEmbeddedSignin;
117 accel_map_[ui::Accelerator(ui::VKEY_K, 121 accel_map_[ui::Accelerator(ui::VKEY_K,
118 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 122 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
119 kAccelNameKioskEnable; 123 kAccelNameKioskEnable;
120 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = 124 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
121 kAccelNameVersion; 125 kAccelNameVersion;
122 accel_map_[ui::Accelerator(ui::VKEY_R, 126 accel_map_[ui::Accelerator(ui::VKEY_R,
123 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = 127 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
124 kAccelNameReset; 128 kAccelNameReset;
125 129
126 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] = 130 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] =
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 webui_visible_ = true; 496 webui_visible_ = true;
493 } 497 }
494 498
495 void WebUILoginView::ReturnFocus(bool reverse) { 499 void WebUILoginView::ReturnFocus(bool reverse) {
496 // Return the focus to the web contents. 500 // Return the focus to the web contents.
497 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 501 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
498 GetWidget()->Activate(); 502 GetWidget()->Activate();
499 } 503 }
500 504
501 } // namespace chromeos 505 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698