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

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

Issue 539273002: Added UI to enable debugging features on CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 using content::NativeWebKeyboardEvent; 49 using content::NativeWebKeyboardEvent;
50 using content::RenderViewHost; 50 using content::RenderViewHost;
51 using content::WebContents; 51 using content::WebContents;
52 using web_modal::WebContentsModalDialogManager; 52 using web_modal::WebContentsModalDialogManager;
53 53
54 namespace { 54 namespace {
55 55
56 // These strings must be kept in sync with handleAccelerator() 56 // These strings must be kept in sync with handleAccelerator()
57 // in display_manager.js. 57 // in display_manager.js.
58 const char kAccelNameCancel[] = "cancel"; 58 const char kAccelNameCancel[] = "cancel";
59 const char kAccelNameEnableDebugging[] = "debugging";
59 const char kAccelNameEnrollment[] = "enrollment"; 60 const char kAccelNameEnrollment[] = "enrollment";
60 const char kAccelNameKioskEnable[] = "kiosk_enable"; 61 const char kAccelNameKioskEnable[] = "kiosk_enable";
61 const char kAccelNameVersion[] = "version"; 62 const char kAccelNameVersion[] = "version";
62 const char kAccelNameReset[] = "reset"; 63 const char kAccelNameReset[] = "reset";
63 const char kAccelFocusPrev[] = "focus_prev"; 64 const char kAccelFocusPrev[] = "focus_prev";
64 const char kAccelFocusNext[] = "focus_next"; 65 const char kAccelFocusNext[] = "focus_next";
65 const char kAccelNameDeviceRequisition[] = "device_requisition"; 66 const char kAccelNameDeviceRequisition[] = "device_requisition";
66 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; 67 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora";
67 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; 68 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark";
68 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; 69 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout";
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = 121 ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
121 kAccelNameEmbeddedSignin; 122 kAccelNameEmbeddedSignin;
122 accel_map_[ui::Accelerator(ui::VKEY_K, 123 accel_map_[ui::Accelerator(ui::VKEY_K,
123 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 124 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
124 kAccelNameKioskEnable; 125 kAccelNameKioskEnable;
125 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = 126 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
126 kAccelNameVersion; 127 kAccelNameVersion;
127 accel_map_[ui::Accelerator(ui::VKEY_R, 128 accel_map_[ui::Accelerator(ui::VKEY_R,
128 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = 129 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
129 kAccelNameReset; 130 kAccelNameReset;
131 accel_map_[ui::Accelerator(ui::VKEY_X,
132 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
133 kAccelNameEnableDebugging;
130 134
131 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] = 135 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] =
132 kAccelFocusPrev; 136 kAccelFocusPrev;
133 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] = 137 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] =
134 kAccelFocusNext; 138 kAccelFocusNext;
135 139
136 // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key. 140 // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key.
137 ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE); 141 ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE);
138 key_up.set_type(ui::ET_KEY_RELEASED); 142 key_up.set_type(ui::ET_KEY_RELEASED);
139 ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE); 143 ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE);
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 webui_visible_ = true; 501 webui_visible_ = true;
498 } 502 }
499 503
500 void WebUILoginView::ReturnFocus(bool reverse) { 504 void WebUILoginView::ReturnFocus(bool reverse) {
501 // Return the focus to the web contents. 505 // Return the focus to the web contents.
502 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 506 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
503 GetWidget()->Activate(); 507 GetWidget()->Activate();
504 } 508 }
505 509
506 } // namespace chromeos 510 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_display.cc ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698