New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/accessibility/accessibility_manager.cc

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index a795d09f5d46b20558fd2f57ce0a0d0e109bfed4..860c7f9e0364010260465184f3db211000c9b5dc 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -481,7 +481,9 @@ void AccessibilityManager::UpdateLargeCursorFromPref() {
 
 bool AccessibilityManager::IsIncognitoAllowed() {
   // Supervised users can't create incognito-mode windows.
-  return !(user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser());
+  return !(user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser() ||
+           user_manager::UserManager::Get()->

[David Tseng, 2014/11/11 17:44:57]

nit: simplify this expression to !a && !b

[merkulova, 2014/11/12 10:01:01]

Done.

+               IsLoggedInAsRegularSupervisedUser());
 }
 
 bool AccessibilityManager::IsLargeCursorEnabled() {