New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
 #include "components/user_manager/user_manager.h"
-#include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "policy/policy_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 556 matching lines @@
         }
       }
     }
   }
 
   // Reset the downloaded profile image as a new user logged in.
   downloaded_profile_image_ = gfx::ImageSkia();
   profile_image_url_ = GURL();
   profile_image_requested_ = false;
 
-  if (IsUserLoggedInAndRegular()) {
+  if (IsUserLoggedInAndHasGaiaAccount()) {
     TryToInitDownloadedProfileImage();
 
     // Schedule an initial download of the profile data (full name and
     // optionally image).
     profile_download_one_shot_timer_.Start(
         FROM_HERE,
         g_ignore_profile_data_download_delay_ ?
             base::TimeDelta() :
             base::TimeDelta::FromSeconds(kProfileDataDownloadDelaySec),
         base::Bind(&UserImageManagerImpl::DownloadProfileData,
@@ skipping 260 matching lines @@
     // user if it has not been initialized already, the user image is the
     // profile image and the user image has been loaded successfully.
     VLOG(1) << "Profile image initialized from disk.";
     downloaded_profile_image_ = user->GetImage();
     profile_image_url_ = user->image_url();
   }
 }
 
 bool UserImageManagerImpl::NeedProfileImage() const {
   const user_manager::User* user = GetUser();
-  return IsUserLoggedInAndRegular() &&
+  return IsUserLoggedInAndHasGaiaAccount() &&
          (user->image_index() == user_manager::User::USER_IMAGE_PROFILE ||
           profile_image_requested_);
 }
 
 void UserImageManagerImpl::DownloadProfileData(const std::string& reason) {
-  // GAIA profiles exist for regular users only.
-  if (!IsUserLoggedInAndRegular())
+  if (!IsUserLoggedInAndHasGaiaAccount())
     return;
 
   // If a download is already in progress, allow it to continue, with one
   // exception: If the current download does not include the profile image but
   // the image has since become necessary, start a new download that includes
   // the profile image.
   if (profile_downloader_ &&
       (downloading_profile_image_ || !NeedProfileImage())) {
     return;
   }
@@ skipping 100 matching lines @@
 }
 
 const user_manager::User* UserImageManagerImpl::GetUser() const {
   return user_manager_->FindUser(user_id());
 }
 
 user_manager::User* UserImageManagerImpl::GetUserAndModify() const {
   return user_manager_->FindUserAndModify(user_id());
 }
 
-bool UserImageManagerImpl::IsUserLoggedInAndRegular() const {
+bool UserImageManagerImpl::IsUserLoggedInAndHasGaiaAccount() const {
   const user_manager::User* user = GetUser();
   if (!user)
     return false;
-  return user->is_logged_in() &&
-         user->GetType() == user_manager::USER_TYPE_REGULAR;
+  return user->is_logged_in() && user->HasGaiaAccount();
 }
 
 }  // namespace chromeos