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

chrome/browser/chromeos/login/users/user.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/users/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 53 matching lines @@
   explicit KioskAppUser(const std::string& app_id);
   virtual ~KioskAppUser();
 
   // Overridden from User:
   virtual user_manager::UserType GetType() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KioskAppUser);
 };
 
-class LocallyManagedUser : public User {
+class SupervisedUser : public User {
  public:
-  explicit LocallyManagedUser(const std::string& username);
-  virtual ~LocallyManagedUser();
+  explicit SupervisedUser(const std::string& username);
+  virtual ~SupervisedUser();
 
   // Overridden from User:
   virtual user_manager::UserType GetType() const OVERRIDE;
   virtual std::string display_email() const OVERRIDE;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(LocallyManagedUser);
+  DISALLOW_COPY_AND_ASSIGN(SupervisedUser);
 };
 
 class RetailModeUser : public User {
  public:
   RetailModeUser();
   virtual ~RetailModeUser();
 
   // Overridden from User:
   virtual user_manager::UserType GetType() const OVERRIDE;
 
@@ skipping 76 matching lines @@
 }
 
 User* User::CreateGuestUser() {
   return new GuestUser;
 }
 
 User* User::CreateKioskAppUser(const std::string& kiosk_app_username) {
   return new KioskAppUser(kiosk_app_username);
 }
 
-User* User::CreateLocallyManagedUser(const std::string& username) {
-  return new LocallyManagedUser(username);
+User* User::CreateSupervisedUser(const std::string& username) {
+  return new SupervisedUser(username);
 }
 
 User* User::CreateRetailModeUser() {
   return new RetailModeUser;
 }
 
 User* User::CreatePublicAccountUser(const std::string& email) {
   return new PublicAccountUser(email);
 }
 
@@ skipping 67 matching lines @@
     : User(kiosk_app_username) {
   set_display_email(kiosk_app_username);
 }
 
 KioskAppUser::~KioskAppUser() {}
 
 user_manager::UserType KioskAppUser::GetType() const {
   return user_manager::USER_TYPE_KIOSK_APP;
 }
 
-LocallyManagedUser::LocallyManagedUser(const std::string& username)
+SupervisedUser::SupervisedUser(const std::string& username)
     : User(username) {
   set_can_lock(true);
 }
 
-LocallyManagedUser::~LocallyManagedUser() {}
+SupervisedUser::~SupervisedUser() {}
 
-user_manager::UserType LocallyManagedUser::GetType() const {
-  return user_manager::USER_TYPE_LOCALLY_MANAGED;
+user_manager::UserType SupervisedUser::GetType() const {
+  return user_manager::USER_TYPE_SUPERVISED;
 }
 
-std::string LocallyManagedUser::display_email() const {
+std::string SupervisedUser::display_email() const {
   return base::UTF16ToUTF8(display_name());
 }
 
 RetailModeUser::RetailModeUser() : User(chromeos::login::kRetailModeUserName) {
   set_display_email(std::string());
 }
 
 RetailModeUser::~RetailModeUser() {}
 
 user_manager::UserType RetailModeUser::GetType() const {
@@ skipping 10 matching lines @@
 }
 
 bool User::has_gaia_account() const {
   COMPILE_ASSERT(user_manager::NUM_USER_TYPES == 6, num_user_types_unexpected);
   switch (GetType()) {
     case user_manager::USER_TYPE_REGULAR:
       return true;
     case user_manager::USER_TYPE_GUEST:
     case user_manager::USER_TYPE_RETAIL_MODE:
     case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
-    case user_manager::USER_TYPE_LOCALLY_MANAGED:
+    case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace chromeos