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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/wizard_controller.cc

Issue 335643003: Revert 276656 "Flag covering HID-detection OOBE screen removed." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 chromeos::WizardController::kNetworkScreenName, 92 chromeos::WizardController::kNetworkScreenName,
93 chromeos::WizardController::kUpdateScreenName, 93 chromeos::WizardController::kUpdateScreenName,
94 chromeos::WizardController::kEulaScreenName, 94 chromeos::WizardController::kEulaScreenName,
95 chromeos::WizardController::kEnrollmentScreenName, 95 chromeos::WizardController::kEnrollmentScreenName,
96 chromeos::WizardController::kTermsOfServiceScreenName, 96 chromeos::WizardController::kTermsOfServiceScreenName,
97 chromeos::WizardController::kAutoEnrollmentCheckScreenName 97 chromeos::WizardController::kAutoEnrollmentCheckScreenName
98 }; 98 };
99 99
100 // Checks flag for HID-detection screen show. 100 // Checks flag for HID-detection screen show.
101 bool CanShowHIDDetectionScreen() { 101 bool CanShowHIDDetectionScreen() {
102 return !CommandLine::ForCurrentProcess()->HasSwitch( 102 return CommandLine::ForCurrentProcess()->HasSwitch(
103 chromeos::switches::kDisableHIDDetectionOnOOBE); 103 chromeos::switches::kEnableHIDDetectionOnOOBE);
104 } 104 }
105 105
106 bool IsResumableScreen(const std::string& screen) { 106 bool IsResumableScreen(const std::string& screen) {
107 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kResumableScreens); ++i) { 107 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kResumableScreens); ++i) {
108 if (screen == kResumableScreens[i]) 108 if (screen == kResumableScreens[i])
109 return true; 109 return true;
110 } 110 }
111 return false; 111 return false;
112 } 112 }
113 113
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 bool WizardController::SetOnTimeZoneResolvedForTesting( 1121 bool WizardController::SetOnTimeZoneResolvedForTesting(
1122 const base::Closure& callback) { 1122 const base::Closure& callback) {
1123 if (timezone_resolved_) 1123 if (timezone_resolved_)
1124 return false; 1124 return false;
1125 1125
1126 on_timezone_resolved_for_testing_ = callback; 1126 on_timezone_resolved_for_testing_ = callback;
1127 return true; 1127 return true;
1128 } 1128 }
1129 1129
1130 } // namespace chromeos 1130 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698