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

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

Issue 2736873004: Remove custom shortcut for Chromad (Closed)
Patch Set: Created 3 years, 9 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/chromeos/policy/device_cloud_policy_initializer.cc » ('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/common/focus_cycler.h" 7 #include "ash/common/focus_cycler.h"
8 #include "ash/common/system/tray/system_tray.h" 8 #include "ash/common/system/tray/system_tray.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 using content::WebContents; 64 using content::WebContents;
65 using web_modal::WebContentsModalDialogManager; 65 using web_modal::WebContentsModalDialogManager;
66 66
67 namespace { 67 namespace {
68 68
69 // These strings must be kept in sync with handleAccelerator() 69 // These strings must be kept in sync with handleAccelerator()
70 // in display_manager.js. 70 // in display_manager.js.
71 const char kAccelNameCancel[] = "cancel"; 71 const char kAccelNameCancel[] = "cancel";
72 const char kAccelNameEnableDebugging[] = "debugging"; 72 const char kAccelNameEnableDebugging[] = "debugging";
73 const char kAccelNameEnrollment[] = "enrollment"; 73 const char kAccelNameEnrollment[] = "enrollment";
74 // TODO(rsorokin): Remove custom Active Directory shortcut for the launch.
75 const char kAccelNameEnrollmentAd[] = "enrollment_ad";
76 const char kAccelNameKioskEnable[] = "kiosk_enable"; 74 const char kAccelNameKioskEnable[] = "kiosk_enable";
77 const char kAccelNameVersion[] = "version"; 75 const char kAccelNameVersion[] = "version";
78 const char kAccelNameReset[] = "reset"; 76 const char kAccelNameReset[] = "reset";
79 const char kAccelNameDeviceRequisition[] = "device_requisition"; 77 const char kAccelNameDeviceRequisition[] = "device_requisition";
80 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora"; 78 const char kAccelNameDeviceRequisitionRemora[] = "device_requisition_remora";
81 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark"; 79 const char kAccelNameDeviceRequisitionShark[] = "device_requisition_shark";
82 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout"; 80 const char kAccelNameAppLaunchBailout[] = "app_launch_bailout";
83 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config"; 81 const char kAccelNameAppLaunchNetworkConfig[] = "app_launch_network_config";
84 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap"; 82 const char kAccelNameToggleEasyBootstrap[] = "toggle_easy_bootstrap";
85 const char kAccelNameBootstrappingSlave[] = "bootstrapping_slave"; 83 const char kAccelNameBootstrappingSlave[] = "bootstrapping_slave";
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 content::NotificationService::AllSources()); 118 content::NotificationService::AllSources());
121 registrar_.Add(this, 119 registrar_.Add(this,
122 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN, 120 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
123 content::NotificationService::AllSources()); 121 content::NotificationService::AllSources());
124 122
125 accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] = 123 accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] =
126 kAccelNameCancel; 124 kAccelNameCancel;
127 accel_map_[ui::Accelerator(ui::VKEY_E, 125 accel_map_[ui::Accelerator(ui::VKEY_E,
128 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 126 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
129 kAccelNameEnrollment; 127 kAccelNameEnrollment;
130 accel_map_[ui::Accelerator(
131 ui::VKEY_A, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
132 kAccelNameEnrollmentAd;
133 if (KioskAppManager::IsConsumerKioskEnabled()) { 128 if (KioskAppManager::IsConsumerKioskEnabled()) {
134 accel_map_[ui::Accelerator(ui::VKEY_K, 129 accel_map_[ui::Accelerator(ui::VKEY_K,
135 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] = 130 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
136 kAccelNameKioskEnable; 131 kAccelNameKioskEnable;
137 } 132 }
138 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = 133 accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
139 kAccelNameVersion; 134 kAccelNameVersion;
140 accel_map_[ui::Accelerator(ui::VKEY_R, 135 accel_map_[ui::Accelerator(ui::VKEY_R,
141 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = 136 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
142 kAccelNameReset; 137 kAccelNameReset;
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 if (should_emit_login_prompt_visible_) { 503 if (should_emit_login_prompt_visible_) {
509 VLOG(1) << "Login WebUI >> login-prompt-visible"; 504 VLOG(1) << "Login WebUI >> login-prompt-visible";
510 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> 505 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
511 EmitLoginPromptVisible(); 506 EmitLoginPromptVisible();
512 } 507 }
513 508
514 webui_visible_ = true; 509 webui_visible_ = true;
515 } 510 }
516 511
517 } // namespace chromeos 512 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698