New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/display/display_preferences.cc

Index: chrome/browser/chromeos/display/display_preferences.cc
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc
index 3e8a93b912f10d6e4100f51b99bbb244ae778f6c..d0b8b3a02e0080063fe51faeb2a0a47e2c8c7eca 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -100,7 +100,7 @@ ash::DisplayManager* GetDisplayManager() {
 bool UserCanSaveDisplayPreference() {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   return user_manager->IsUserLoggedIn() &&
-      (user_manager->IsLoggedInAsRegularUser() ||
+      (user_manager->IsLoggedInAsUserWithGaiaAccount() ||
        user_manager->IsLoggedInAsSupervisedUser() ||
        user_manager->IsLoggedInAsKioskApp());
 }