chrome/browser/chromeos/login/ui/webui_login_view.cc - Issue 2898003002: Allow the powerwash shortcut only for devices without FRE

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 2898003002: Allow the powerwash shortcut only for devices without FRE (Closed)

Patch Set: Let the powerwash shortcut only for devices without FRE Created 3 years, 7 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 side-by-side diff with in-line comments

« chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc ('K') | « chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..dc68ce8da112894f37cff9cd4eed296ede315075 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,13 @@ 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;

+ AutoEnrollmentController::FRERequirement requirement =

achuithb 2017/05/22 19:21:29 nit const. nit newline before this line Also, pl

igorcov 2017/05/23 09:28:49 Done.

+ AutoEnrollmentController::GetFRERequirement();

+ if (requirement == AutoEnrollmentController::NOT_REQUIRED ||

+ requirement == AutoEnrollmentController::EXPLICITLY_NOT_REQUIRED)

achuithb 2017/05/22 19:21:28 Add {}

igorcov 2017/05/23 09:28:49 Done.

+ accel_map_[ui::Accelerator(ui::VKEY_R,

+ ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |

+ ui::EF_SHIFT_DOWN)] = kAccelNameReset;

achuithb 2017/05/22 19:21:29 nit newline after this line

igorcov 2017/05/23 09:28:49 Done.

accel_map_[ui::Accelerator(ui::VKEY_X,

ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =

kAccelNameEnableDebugging;