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..370ff7cd9d41fe971efce4f7e7093edf443e5b14 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -75,6 +75,12 @@ class USER_MANAGER_EXPORT User : public UserInfo {
     WALLPAPER_TYPE_COUNT = 6
   };
 
+  // Returns true if user type is regular.
+  static bool TypeIsRegular(UserType user_type);
+
+  // Returns true if user type is supervised.
+  static bool TypeIsSupervised(UserType user_type);
+
   // Returns the user type.
   virtual UserType GetType() const = 0;
 
@@ -91,10 +97,14 @@ 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;
   virtual void SetIsSupervised(bool is_supervised);

[Nikita (slow), 2014/11/11 12:06:36]

nit: Add comment.

[merkulova, 2014/11/11 15:47:44]

Done.

 
+  // Returns true if user is regular.
+  virtual bool IsRegular() 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;