Rename "managed (mode|user)" to "supervised user" (part 7)

chrome/browser/chromeos/login/screens/screen_factory.cc

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..52af66fd1e5c1004eeb28d585720d6279757d3d1 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,7 +24,7 @@ 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[] =
+const char ScreenFactory::kSupervisedUserCreationScreenId[] =

[Pam (message me for reviews), 2014/07/16 18:12:36]

alphabetize

[Marc Treib, 2014/07/17 08:58:39]

Done.

   "locally-managed-user-creation-flow";
 const char ScreenFactory::kNetworkScreenId[] = "network";
 const char ScreenFactory::kResetScreenId[] = "reset";
@@ -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());
   }