New user type introduced. Combines regular and supervised features.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 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/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 82 matching lines @@
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ime_keyboard.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"

[bartfab (slow), 2014/11/11 19:42:06]

Nit: No longer used.

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

Done.

 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "net/base/escape.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 432 matching lines @@
     chrome::ShowSingletonTab(displayer.browser(),
                              GURL(chrome::kLearnMoreEnterpriseURL));
   }
 }
 
 void SystemTrayDelegateChromeOS::ShowUserLogin() {
   ash::Shell* shell = ash::Shell::GetInstance();
   if (!shell->delegate()->IsMultiProfilesEnabled())
     return;
 
   // Only regular users could add other users to current session.

[Daniel Erat, 2014/11/11 16:02:49]

please update this comment to describe what the condition is actually testing
now (e.g. "Only regular, non-supervised users ...")

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

Done.

-  if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=
-      user_manager::USER_TYPE_REGULAR) {
+  if (!user_manager::UserManager::Get()->GetActiveUser()->IsRegular() ||

[bartfab (slow), 2014/11/11 19:42:06]

The old code implemented the exactly same condition in a simpler way.

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

Done.

+       user_manager::UserManager::Get()->GetActiveUser()->IsSupervised()) {

[Daniel Erat, 2014/11/11 16:02:49]

nit: indent this one space less:

  if (!user_manager::... ||
      user_manager::...) {

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

Done.

     return;
   }
 
   if (static_cast<int>(
           user_manager::UserManager::Get()->GetLoggedInUsers().size()) >=
       shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers())
     return;
 
   // Launch sign in screen to add another user to current session.
   if (user_manager::UserManager::Get()
@@ skipping 742 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos