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

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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 using content::NativeWebKeyboardEvent; 50 using content::NativeWebKeyboardEvent;
51 using content::RenderViewHost; 51 using content::RenderViewHost;
52 using content::WebContents; 52 using content::WebContents;
53 using web_modal::WebContentsModalDialogManager; 53 using web_modal::WebContentsModalDialogManager;
54 54
55 namespace { 55 namespace {
56 56
57 // These strings must be kept in sync with handleAccelerator() 57 // These strings must be kept in sync with handleAccelerator()
58 // in display_manager.js. 58 // in display_manager.js.
59 const char kAccelNameCancel[] = "cancel"; 59 const char kAccelNameCancel[] = "cancel";
60 const char kAccelNameEnableDebugging[] = "debugging";
60 const char kAccelNameEnrollment[] = "enrollment"; 61 const char kAccelNameEnrollment[] = "enrollment";
61 const char kAccelNameKioskEnable[] = "kiosk_enable"; 62 const char kAccelNameKioskEnable[] = "kiosk_enable";
62 const char kAccelNameVersion[] = "version"; 63 const char kAccelNameVersion[] = "version";
63 const char kAccelNameReset[] = "reset"; 64 const char kAccelNameReset[] = "reset";
64 const char kAccelFocusPrev[] = "focus_prev"; 65 const char kAccelFocusPrev[] = "focus_prev";
65 const char kAccelFocusNext[] = "focus_next"; 66 const char kAccelFocusNext[] = "focus_next";
66 const char kAccelNameDeviceRequisition[] = "device_requisition"; 67 const char kAccelNameDeviceRequisition[] = "device_requisition";
67 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; 68 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora";
68 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; 69 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark";
69 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; 70 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout";
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = 122 ui::VKEY_G, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
122 kAccelNameEmbeddedSignin; 123 kAccelNameEmbeddedSignin;
123 accel_map_[ui::Accelerator(ui::VKEY_K, 124 accel_map_[ui::Accelerator(ui::VKEY_K,
124 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 125 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
125 kAccelNameKioskEnable; 126 kAccelNameKioskEnable;
126 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = 127 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
127 kAccelNameVersion; 128 kAccelNameVersion;
128 accel_map_[ui::Accelerator(ui::VKEY_R, 129 accel_map_[ui::Accelerator(ui::VKEY_R,
129 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = 130 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
130 kAccelNameReset; 131 kAccelNameReset;
132 accel_map_[ui::Accelerator(ui::VKEY_X,
133 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
134 kAccelNameEnableDebugging;
131 135
132 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] = 136 accel_map_[ui::Accelerator(ui::VKEY_LEFT, ui::EF_NONE)] =
133 kAccelFocusPrev; 137 kAccelFocusPrev;
134 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] = 138 accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] =
135 kAccelFocusNext; 139 kAccelFocusNext;
136 140
137 // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key. 141 // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key.
138 ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE); 142 ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE);
139 key_up.set_type(ui::ET_KEY_RELEASED); 143 key_up.set_type(ui::ET_KEY_RELEASED);
140 ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE); 144 ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE);
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 webui_visible_ = true; 502 webui_visible_ = true;
499 } 503 }
500 504
501 void WebUILoginView::ReturnFocus(bool reverse) { 505 void WebUILoginView::ReturnFocus(bool reverse) {
502 // Return the focus to the web contents. 506 // Return the focus to the web contents.
503 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 507 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
504 GetWidget()->Activate(); 508 GetWidget()->Activate();
505 } 509 }
506 510
507 } // namespace chromeos 511 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698