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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 273533004: Flag covering HID-detection OOBE screen removed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 6 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
Download patch
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 4fe6eaf447e3217de757ea04c7913c2b5ee7e876..147667a179f3c09d975566daf2d6e8ab8f800bf3 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -99,8 +99,8 @@ const char *kResumableScreens[] = {
// Checks flag for HID-detection screen show.
bool CanShowHIDDetectionScreen() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableHIDDetectionOnOOBE);
+ return !CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kDisableHIDDetectionOnOOBE);
}
bool IsResumableScreen(const std::string& screen) {
@@ -545,7 +545,9 @@ void WizardController::SkipUpdateEnrollAfterEula() {
///////////////////////////////////////////////////////////////////////////////
// WizardController, ExitHandlers:
void WizardController::OnHIDDetectionCompleted() {
- ShowNetworkScreen();
+ // Check for tests configuration.
+ if (!StartupUtils::IsOobeCompleted())
+ ShowNetworkScreen();
}
void WizardController::OnNetworkConnected() {
« no previous file with comments | « chrome/browser/chromeos/login/screens/core_oobe_actor.h ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698