Methods and types rename for child accounts.

components/user_manager/user_manager.h

 // 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.
 
 #ifndef COMPONENTS_USER_MANAGER_USER_MANAGER_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_H_
 
 #include <string>
 
 #include "components/user_manager/user.h"
@@ skipping 34 matching lines @@
     // Called when active user has changed.
     virtual void ActiveUserChanged(const User* active_user);
 
     // Called when another user got added to the existing session.
     virtual void UserAddedToSession(const User* added_user);
 
     // Called right before notifying on user change so that those who rely
     // on user_id hash would be accessing up-to-date value.
     virtual void ActiveUserHashChanged(const std::string& hash);
 
-    // Called when supervised status has changed.
-    virtual void UserChangedSupervisedStatus(User* user);
+    // Called when child status has changed.
+    virtual void UserChangedChildStatus(User* user);
 
    protected:
     virtual ~UserSessionStateObserver();
   };
 
   // Data retrieved from user account.
   class UserAccountData {
    public:
     UserAccountData(const base::string16& display_name,
                     const base::string16& given_name,
@@ skipping 193 matching lines @@
   // Returns true if the current user's session can be locked (i.e. the user has
   // a password with which to unlock the session).
   virtual bool CanCurrentUserLock() const = 0;
 
   // Returns true if at least one user has signed in.
   virtual bool IsUserLoggedIn() const = 0;
 
   // Returns true if we're logged in as a user with gaia account.
   virtual bool IsLoggedInAsUserWithGaiaAccount() const = 0;
 
-  // Returns true if we're logged in as a regular supervised user.
-  virtual bool IsLoggedInAsRegularSupervisedUser() const = 0;
+  // Returns true if we're logged in as a child user.
+  virtual bool IsLoggedInAsChildUser() const = 0;
 
   // Returns true if we're logged in as a demo user.
   virtual bool IsLoggedInAsDemoUser() const = 0;
 
   // Returns true if we're logged in as a public account.
   virtual bool IsLoggedInAsPublicAccount() const = 0;
 
   // Returns true if we're logged in as a Guest.
   virtual bool IsLoggedInAsGuest() const = 0;
 
-  // Returns true if we're logged in as a supervised user.
+  // Returns true if we're logged in as a legacy supervised user.
   virtual bool IsLoggedInAsSupervisedUser() const = 0;
 
   // Returns true if we're logged in as a kiosk app.
   virtual bool IsLoggedInAsKioskApp() const = 0;
 
   // Returns true if we're logged in as the stub user used for testing on Linux.
   virtual bool IsLoggedInAsStub() const = 0;
 
   // Returns true if we're logged in and browser has been started i.e.
   // browser_creator.LaunchBrowser(...) was called after sign in
   // or restart after crash.
   virtual bool IsSessionStarted() const = 0;
 
   // Returns true if data stored or cached for the user with the given user id
   // address outside that user's cryptohome (wallpaper, avatar, OAuth token
   // status, display name, display email) is to be treated as ephemeral.
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& user_id) const = 0;
 
   virtual void AddObserver(Observer* obs) = 0;
   virtual void RemoveObserver(Observer* obs) = 0;
 
   virtual void AddSessionStateObserver(UserSessionStateObserver* obs) = 0;
   virtual void RemoveSessionStateObserver(UserSessionStateObserver* obs) = 0;
 
   virtual void NotifyLocalStateChanged() = 0;
 
-  // Makes the supervised status change and notifies observers.
-  virtual void ChangeUserSupervisedStatus(User* user, bool is_supervised) = 0;
+  // Makes the child status change and notifies observers.

[Marc Treib, 2014/12/08 13:27:54]

nit: Changes the child status and notifies observers.

[merkulova, 2014/12/08 14:56:12]

Done.

+  virtual void ChangeUserChildStatus(User* user, bool is_child) = 0;
 
 
   // Returns true if supervised users allowed.
   virtual bool AreSupervisedUsersAllowed() const = 0;
 
  protected:
   // Sets UserManager instance.
   static void SetInstance(UserManager* user_manager);
 
   // Pointer to the existing UserManager instance (if any).
@@ skipping 10 matching lines @@
   static UserManager* GetForTesting();
 
   // Sets UserManager instance to the given |user_manager|.
   // Returns the previous value of the instance.
   static UserManager* SetForTesting(UserManager* user_manager);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_H_