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

Unified Diff: chrome/browser/chromeos/login/screens/screen_factory.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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/screens/screen_factory.cc
diff --git a/chrome/browser/chromeos/login/screens/screen_factory.cc b/chrome/browser/chromeos/login/screens/screen_factory.cc
index 216405b56af90e8c2d2803a80201db8eedb9f92c..0496e8c849461bd15804430fcf821ffd261c46a5 100644
--- a/chrome/browser/chromeos/login/screens/screen_factory.cc
+++ b/chrome/browser/chromeos/login/screens/screen_factory.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/chromeos/login/screens/screen_factory.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
-#include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/screens/error_screen.h"
#include "chrome/browser/chromeos/login/screens/eula_screen.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/chromeos/login/screens/update_screen.h"
#include "chrome/browser/chromeos/login/screens/user_image_screen.h"
#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
+#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h"
namespace chromeos {
@@ -24,10 +24,10 @@ const char ScreenFactory::kEnrollmentScreenId[] = "enroll";
const char ScreenFactory::kErrorScreenId[] = "error-message";
const char ScreenFactory::kEulaScreenId[] = "eula";
const char ScreenFactory::kKioskAutolaunchScreenId[] = "autolaunch";
-const char ScreenFactory::kLocallyManagedUserCreationScreenId[] =
- "locally-managed-user-creation-flow";
const char ScreenFactory::kNetworkScreenId[] = "network";
const char ScreenFactory::kResetScreenId[] = "reset";
+const char ScreenFactory::kSupervisedUserCreationScreenId[] =
+ "locally-managed-user-creation-flow";
const char ScreenFactory::kTermsOfServiceScreenId[] = "tos";
const char ScreenFactory::kUpdateScreenId[] = "update";
const char ScreenFactory::kUserImageScreenId[] = "image";
@@ -75,10 +75,10 @@ BaseScreen* ScreenFactory::CreateScreenImpl(const std::string& id) {
return new WrongHWIDScreen(
observer_,
oobe_display_->GetWrongHWIDScreenActor());
- } else if (id == kLocallyManagedUserCreationScreenId) {
- return new LocallyManagedUserCreationScreen(
+ } else if (id == kSupervisedUserCreationScreenId) {
+ return new SupervisedUserCreationScreen(
observer_,
- oobe_display_->GetLocallyManagedUserCreationScreenActor());
+ oobe_display_->GetSupervisedUserCreationScreenActor());
} else if (id == kErrorScreenId) {
return new ErrorScreen(observer_, oobe_display_->GetErrorScreenActor());
}
« no previous file with comments | « chrome/browser/chromeos/login/screens/screen_factory.h ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698