New user type introduced. Combines regular and supervised features.

chrome/browser/chromeos/accessibility/accessibility_manager.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/accessibility/accessibility_manager.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 463 matching lines @@
 #if defined(OS_CHROMEOS)
   ash::Shell::GetInstance()->SetCursorCompositingEnabled(
       ShouldEnableCursorCompositing());
 #endif
 
 #endif // !USE_ATHENA
 }
 
 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() {
   return large_cursor_enabled_;
 }
 
 void AccessibilityManager::EnableStickyKeys(bool enabled) {
   if (!profile_)
     return;
   PrefService* pref_service = profile_->GetPrefs();
@@ skipping 654 matching lines @@
   // Do any teardown work needed immediately after ChromeVox actually unloads.
   if (system_sounds_enabled_)
     ash::PlaySystemSoundAlways(SOUND_SPOKEN_FEEDBACK_DISABLED);
 #endif
   // Clear the accessibility focus ring.
   AccessibilityFocusRingController::GetInstance()->SetFocusRing(
       std::vector<gfx::Rect>());
 }
 
 }  // namespace chromeos