New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.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 CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 131 matching lines @@
   // Create a sync observer if a user is logged in, the user's user image is
   // allowed to be synced and no sync observer exists yet.
   void TryToCreateImageSyncObserver();
 
   // Returns immutable version of user with |user_id_|.
   const user_manager::User* GetUser() const;
 
   // Returns mutable version of user with |user_id_|.
   user_manager::User* GetUserAndModify() const;
 
-  // Returns true if user with |user_id_| is logged in and a regular user.
-  bool IsUserLoggedInAndRegular() const;
+  // Returns true if user with |user_id_| is logged in and has gaia account.

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

Nit: s/has/has a/

+  bool IsUserLoggedInAndHasGaiaAccount() const;
 
   // The user manager.
   user_manager::UserManager* user_manager_;
 
   // Loader for JPEG user images.
   scoped_refptr<UserImageLoader> image_loader_;
 
   // Unsafe loader instance for all user images formats.
   scoped_refptr<UserImageLoader> unsafe_image_loader_;
 
@@ skipping 54 matching lines @@
   bool user_needs_migration_;
 
   base::WeakPtrFactory<UserImageManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserImageManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_AVATAR_USER_IMAGE_MANAGER_IMPL_H_