Chromium Code Reviews| Index: chrome/browser/chromeos/login/ui/webui_login_view.cc |
| diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc |
| index 89d498dadc72af31b2a078d34a82500c8123f723..e49be326e744c2022b8f601e7be0194e00e69eb6 100644 |
| --- a/chrome/browser/chromeos/login/ui/webui_login_view.cc |
| +++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc |
| @@ -20,6 +20,7 @@ |
| #include "chrome/browser/chrome_notification_types.h" |
| #include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
| +#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h" |
| #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| #include "chrome/browser/chromeos/login/ui/preloaded_web_view.h" |
| #include "chrome/browser/chromeos/login/ui/preloaded_web_view_factory.h" |
| @@ -60,6 +61,7 @@ |
| #include "ui/views/controls/webview/webview.h" |
| #include "ui/views/widget/widget.h" |
| +using chromeos::AutoEnrollmentController; |
| using content::NativeWebKeyboardEvent; |
| using content::RenderViewHost; |
| using content::WebContents; |
| @@ -141,9 +143,18 @@ WebUILoginView::WebUILoginView(const WebViewSettings& settings) |
| } |
| accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] = |
| kAccelNameVersion; |
| - accel_map_[ui::Accelerator(ui::VKEY_R, |
| - ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
| - kAccelNameReset; |
| + |
| + // The devices with forced re-enrollment enabled shouldn't be able to |
|
achuithb
2017/05/23 19:59:01
nit: drop 'The'
|
| + // powerwash. |
| + const AutoEnrollmentController::FRERequirement requirement = |
| + AutoEnrollmentController::GetFRERequirement(); |
| + if (requirement == AutoEnrollmentController::NOT_REQUIRED || |
| + requirement == AutoEnrollmentController::EXPLICITLY_NOT_REQUIRED) { |
| + accel_map_[ui::Accelerator(ui::VKEY_R, |
| + ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | |
| + ui::EF_SHIFT_DOWN)] = kAccelNameReset; |
| + } |
| + |
| accel_map_[ui::Accelerator(ui::VKEY_X, |
| ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] = |
| kAccelNameEnableDebugging; |