New user type introduced. Combines regular and supervised features.

components/user_manager/user.h

Index: components/user_manager/user.h
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 1a315534ad4b3530144969c88eff4f966d4ca3f5..907c365af991b5e6357e6b80c6f4d84128314dbe 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -75,6 +75,9 @@ class USER_MANAGER_EXPORT User : public UserInfo {
     WALLPAPER_TYPE_COUNT = 6
   };
 
+  // Returns true if user type has gaia account.

[bartfab (slow), 2014/11/27 12:51:51]

Nit 1: s/user/the user/
Nit 2: s/gaia/a gaia/

+  static bool TypeHasGaiaAccount(UserType user_type);
+
   // Returns the user type.
   virtual UserType GetType() const = 0;
 
@@ -91,10 +94,16 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   const gfx::ImageSkia& GetImage() const override;
   std::string GetUserID() const override;
 
-  // Is user supervised.
-  virtual bool IsSupervised() const;
+  // Allows managing supervised status of the user. Used for RegularUser.

[bartfab (slow), 2014/11/27 12:51:51]

Nit 1: "Managing" is somewhat overloaded. I think "setting" would be more
neutral.
Nit 2: s/managing supervised status of the user/management of the user's
supervised status/
Nit 3: The reference to the |RegularUser| class here in the header is strange as
that class is only defined as an internal detail in the implementation file. How
about "regular user" instead?

   virtual void SetIsSupervised(bool is_supervised);
 
+  // Returns true if user has gaia account. True for users of types

[bartfab (slow), 2014/11/27 12:51:51]

Nit 1: s/user/the user/
Nit 2: s/gaia/a gaia/

+  // USER_TYPE_REGULAR and USER_TYPE_REGULAR_SUPERVISED.
+  virtual bool HasGaiaAccount() const;
+
+  // Returns true if user is supervised.
+  virtual bool IsSupervised() const;
+
   // Returns the account name part of the email. Use the display form of the
   // email if available and use_display_name == true. Otherwise use canonical.
   std::string GetAccountName(bool use_display_email) const;