New user type introduced. Combines regular and supervised features.

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 235 matching lines @@
   // display email) is ephemeral.
   virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const = 0;
 
   // 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 regular user.
-  virtual bool IsLoggedInAsRegularUser() 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 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;
 
@@ skipping 50 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_