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

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

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 const char WizardController::kEnrollmentScreenName[] = "enroll"; 152 const char WizardController::kEnrollmentScreenName[] = "enroll";
153 const char WizardController::kResetScreenName[] = "reset"; 153 const char WizardController::kResetScreenName[] = "reset";
154 const char WizardController::kKioskEnableScreenName[] = "kiosk-enable"; 154 const char WizardController::kKioskEnableScreenName[] = "kiosk-enable";
155 const char WizardController::kKioskAutolaunchScreenName[] = "autolaunch"; 155 const char WizardController::kKioskAutolaunchScreenName[] = "autolaunch";
156 const char WizardController::kErrorScreenName[] = "error-message"; 156 const char WizardController::kErrorScreenName[] = "error-message";
157 const char WizardController::kTermsOfServiceScreenName[] = "tos"; 157 const char WizardController::kTermsOfServiceScreenName[] = "tos";
158 const char WizardController::kAutoEnrollmentCheckScreenName[] = 158 const char WizardController::kAutoEnrollmentCheckScreenName[] =
159 "auto-enrollment-check"; 159 "auto-enrollment-check";
160 const char WizardController::kWrongHWIDScreenName[] = "wrong-hwid"; 160 const char WizardController::kWrongHWIDScreenName[] = "wrong-hwid";
161 const char WizardController::kSupervisedUserCreationScreenName[] = 161 const char WizardController::kSupervisedUserCreationScreenName[] =
162 "locally-managed-user-creation-flow"; 162 "supervised-user-creation-flow";
163 const char WizardController::kAppLaunchSplashScreenName[] = 163 const char WizardController::kAppLaunchSplashScreenName[] =
164 "app-launch-splash"; 164 "app-launch-splash";
165 const char WizardController::kHIDDetectionScreenName[] = "hid-detection"; 165 const char WizardController::kHIDDetectionScreenName[] = "hid-detection";
166 const char WizardController::kControllerPairingScreenName[] = 166 const char WizardController::kControllerPairingScreenName[] =
167 "controller-pairing"; 167 "controller-pairing";
168 const char WizardController::kHostPairingScreenName[] = "host-pairing"; 168 const char WizardController::kHostPairingScreenName[] = "host-pairing";
169 169
170 // static 170 // static
171 const int WizardController::kMinAudibleOutputVolumePercent = 10; 171 const int WizardController::kMinAudibleOutputVolumePercent = 10;
172 172
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 bool WizardController::SetOnTimeZoneResolvedForTesting( 1275 bool WizardController::SetOnTimeZoneResolvedForTesting(
1276 const base::Closure& callback) { 1276 const base::Closure& callback) {
1277 if (timezone_resolved_) 1277 if (timezone_resolved_)
1278 return false; 1278 return false;
1279 1279
1280 on_timezone_resolved_for_testing_ = callback; 1280 on_timezone_resolved_for_testing_ = callback;
1281 return true; 1281 return true;
1282 } 1282 }
1283 1283
1284 } // namespace chromeos 1284 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698