New user type introduced. Combines regular and supervised features.

components/user_manager/user_manager_base.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_BASE_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 68 matching lines @@
   virtual std::string GetUserDisplayEmail(
       const std::string& user_id) const override;
   virtual void UpdateUserAccountData(
       const std::string& user_id,
       const UserAccountData& account_data) override;
   virtual bool IsCurrentUserOwner() const override;
   virtual bool IsCurrentUserNew() const override;
   virtual bool IsCurrentUserNonCryptohomeDataEphemeral() const override;
   virtual bool CanCurrentUserLock() const override;
   virtual bool IsUserLoggedIn() const override;
-  virtual bool IsLoggedInAsRegularUser() const override;
+  virtual bool IsLoggedInAsUserWithGaiaAccount() const override;
+  virtual bool IsLoggedInAsRegularSupervisedUser() const override;
   virtual bool IsLoggedInAsDemoUser() const override;
   virtual bool IsLoggedInAsPublicAccount() const override;
   virtual bool IsLoggedInAsGuest() const override;
   virtual bool IsLoggedInAsSupervisedUser() const override;
   virtual bool IsLoggedInAsKioskApp() const override;
   virtual bool IsLoggedInAsStub() const override;
   virtual bool IsSessionStarted() const override;
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& user_id) const override;
   virtual void AddObserver(UserManager::Observer* obs) override;
@@ skipping 200 matching lines @@
 
   // Notifies observers that active user_id hash has changed.
   void NotifyActiveUserHashChanged(const std::string& hash);
 
   // Update the global LoginState.
   void UpdateLoginState();
 
   // Insert |user| at the front of the LRU user list.
   void SetLRUUser(User* user);
 
-  // Sends metrics in response to a regular user logging in.
-  void SendRegularUserLoginMetrics(const std::string& user_id);
+  // Sends metrics in response to a user with gaia account (regular) logging in.

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

Nit 1: s/gaia/a gaia/
Nit 2: I am not sure the "regular" here makes things clearer. If anything, it
makes it sound like there are different typesof users with gaia accounts and
this method apply to a subset of them (the regular users) only.

+  void SendGaiaUserLoginMetrics(const std::string& user_id);
 
   // Sets account locale for user with id |user_id|.
   virtual void UpdateUserAccountLocale(const std::string& user_id,
                                        const std::string& locale);
 
   // Updates user account after locale was resolved.
   void DoUpdateAccountLocale(const std::string& user_id,
                              scoped_ptr<std::string> resolved_locale);
 
   // Indicates stage of loading user from prefs.
@@ skipping 62 matching lines @@
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_