New user type introduced. Combines regular and supervised features.

components/user_manager/user.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_H_
 #define COMPONENTS_USER_MANAGER_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 57 matching lines @@
   enum WallpaperType {
     /* DAILY = 0 */    // Removed.
     CUSTOMIZED = 1,    // Selected by user.
     DEFAULT = 2,       // Default.
     /* UNKNOWN = 3 */  // Removed.
     ONLINE = 4,        // WallpaperInfo.location denotes an URL.
     POLICY = 5,        // Controlled by policy, can't be changed by the user.
     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;
 
   // The email the user used to log in.
   const std::string& email() const { return email_; }
 
   // The displayed user name.
   base::string16 display_name() const { return display_name_; }
 
   // UserInfo
   std::string GetEmail() const override;
   base::string16 GetDisplayName() const override;
   base::string16 GetGivenName() const override;
   const gfx::ImageSkia& GetImage() const override;
   std::string GetUserID() const override;
 
-  // Is user supervised.
+  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;
-  virtual void SetIsSupervised(bool is_supervised);
 
   // 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;
 
   // Whether the user has a default image.
   bool HasDefaultImage() const;
 
   // True if user image can be synced.
   virtual bool CanSyncImage() const;
@@ skipping 165 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_H_