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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.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/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 const char OobeUI::kScreenOobeReset[] = "reset"; 134 const char OobeUI::kScreenOobeReset[] = "reset";
135 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin"; 135 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin";
136 const char OobeUI::kScreenAccountPicker[] = "account-picker"; 136 const char OobeUI::kScreenAccountPicker[] = "account-picker";
137 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch"; 137 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
138 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable"; 138 const char OobeUI::kScreenKioskEnable[] = "kiosk-enable";
139 const char OobeUI::kScreenErrorMessage[] = "error-message"; 139 const char OobeUI::kScreenErrorMessage[] = "error-message";
140 const char OobeUI::kScreenUserImagePicker[] = "user-image"; 140 const char OobeUI::kScreenUserImagePicker[] = "user-image";
141 const char OobeUI::kScreenTpmError[] = "tpm-error-message"; 141 const char OobeUI::kScreenTpmError[] = "tpm-error-message";
142 const char OobeUI::kScreenPasswordChanged[] = "password-changed"; 142 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
143 const char OobeUI::kScreenSupervisedUserCreationFlow[] = 143 const char OobeUI::kScreenSupervisedUserCreationFlow[] =
144 "managed-user-creation"; 144 "supervised-user-creation";
145 const char OobeUI::kScreenTermsOfService[] = "terms-of-service"; 145 const char OobeUI::kScreenTermsOfService[] = "terms-of-service";
146 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid"; 146 const char OobeUI::kScreenWrongHWID[] = "wrong-hwid";
147 const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check"; 147 const char OobeUI::kScreenAutoEnrollmentCheck[] = "auto-enrollment-check";
148 const char OobeUI::kScreenHIDDetection[] = "hid-detection"; 148 const char OobeUI::kScreenHIDDetection[] = "hid-detection";
149 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash"; 149 const char OobeUI::kScreenAppLaunchSplash[] = "app-launch-splash";
150 const char OobeUI::kScreenConfirmPassword[] = "confirm-password"; 150 const char OobeUI::kScreenConfirmPassword[] = "confirm-password";
151 const char OobeUI::kScreenFatalError[] = "fatal-error"; 151 const char OobeUI::kScreenFatalError[] = "fatal-error";
152 const char OobeUI::kScreenControllerPairing[] = "controller-pairing"; 152 const char OobeUI::kScreenControllerPairing[] = "controller-pairing";
153 const char OobeUI::kScreenHostPairing[] = "host-pairing"; 153 const char OobeUI::kScreenHostPairing[] = "host-pairing";
154 154
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 DCHECK(screen_ids_.count(screen)) 530 DCHECK(screen_ids_.count(screen))
531 << "Screen should be registered in InitializeScreenMaps()"; 531 << "Screen should be registered in InitializeScreenMaps()";
532 Screen new_screen = screen_ids_[screen]; 532 Screen new_screen = screen_ids_[screen];
533 FOR_EACH_OBSERVER(Observer, 533 FOR_EACH_OBSERVER(Observer,
534 observer_list_, 534 observer_list_,
535 OnCurrentScreenChanged(current_screen_, new_screen)); 535 OnCurrentScreenChanged(current_screen_, new_screen));
536 current_screen_ = new_screen; 536 current_screen_ = new_screen;
537 } 537 }
538 538
539 } // namespace chromeos 539 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698