New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/profiles/profile_helper.cc

 // Copyright (c) 2013 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/profiles/profile_helper.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
@@ skipping 158 matching lines @@
   // Initialize Chrome OS preferences like touch pad sensitivity. For the
   // preferences to work in the guest mode, the initialization has to be
   // done after |profile| is switched to the incognito profile (which
   // is actually GuestSessionProfile in the guest mode). See the
   // GetOffTheRecordProfile() call above.
   profile->InitChromeOSPreferences();
 
   // Add observer so we can see when the first profile's session restore is
   // completed. After that, we won't need the default profile anymore.
   if (!IsSigninProfile(profile) &&
-      user_manager::UserManager::Get()->IsLoggedInAsRegularUser() &&
+      user_manager::UserManager::Get()->IsLoggedInAsUserWithGaiaAccount() &&
       !user_manager::UserManager::Get()->IsLoggedInAsStub()) {
     chromeos::OAuth2LoginManager* login_manager =
         chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile(
             profile);
     if (login_manager)
       login_manager->AddObserver(this);
   }
 }
 
 base::FilePath ProfileHelper::GetActiveUserProfileDir() {
@@ skipping 186 matching lines @@
   user_to_profile_for_testing_[user] = profile;
 }
 
 // static
 std::string ProfileHelper::GetUserIdHashByUserIdForTesting(
     const std::string& user_id) {
   return user_id + kUserIdHashSuffix;
 }
 
 }  // namespace chromeos