Added calls for deferred supervised user status change.

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 175 matching lines @@
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : user_profile_(NULL),
       clock_type_(base::GetHourClockType()),
       search_key_mapped_to_(input_method::kSearchKey),
       screen_locked_(false),
       have_session_start_time_(false),
       have_session_length_limit_(false),
       should_run_bluetooth_discovery_(false),
+      session_started_(false),

[Daniel Erat, 2014/10/07 16:19:19]

do you need to check whether a session is already started when initializing
this? what happens if chrome crashes and restarts while the user is already
logged in?

[merkulova, 2014/10/08 09:47:11]

I'm using this flag to prevent early UpdateAfterLoginStatusChange call that
updates UI according to user type.
I chrome crashes it's restarted. TrayDelegate is recreated, then gets
NOTIFICATION_SESSION_STARTED, then UpdateAfterLoginStatusChange calls update UI
if necessary.

       volume_control_delegate_(new VolumeController()),
       device_settings_observer_(CrosSettings::Get()->AddSettingsObserver(
           kSystemUse24HourClock,
           base::Bind(&SystemTrayDelegateChromeOS::UpdateClockType,
                      base::Unretained(this)))),
       weak_ptr_factory_(this) {
   // Register notifications on construction so that events such as
   // PROFILE_CREATED do not get missed if they happen before Initialize().
   registrar_.reset(new content::NotificationRegistrar);
   registrar_->Add(this,
@@ skipping 12 matching lines @@
                   content::NotificationService::AllSources());
   registrar_->Add(this,
                   chrome::NOTIFICATION_PROFILE_DESTROYED,
                   content::NotificationService::AllSources());
 
   AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
   CHECK(accessibility_manager);
   accessibility_subscription_ = accessibility_manager->RegisterCallback(
       base::Bind(&SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged,
                  base::Unretained(this)));
+
+  user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
   DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
   ash::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
   UpdateClockType();
 
   device::BluetoothAdapterFactory::GetAdapter(
@@ skipping 71 matching lines @@
 
   BrowserList::RemoveObserver(this);
   StopObservingAppWindowRegistry();
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
       connector->GetDeviceCloudPolicyManager();
   if (policy_manager)
     policy_manager->core()->store()->RemoveObserver(this);
+
+  user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
 }
 
 // Overridden from ash::SystemTrayDelegate:
 bool SystemTrayDelegateChromeOS::GetTrayVisibilityOnStartup() {
   // In case of OOBE / sign in screen tray will be shown later.
   return LoginState::Get()->IsUserLoggedIn();
 }
 
 ash::user::LoginStatus SystemTrayDelegateChromeOS::GetUserLoginStatus() const {
   // All non-logged in ChromeOS specific LOGGED_IN states map to the same
@@ skipping 523 matching lines @@
     Profile* user_profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
     CHECK(user_profile);
     accounts_delegates_.set(
         user_id,
         scoped_ptr<ash::tray::UserAccountsDelegate>(
             new UserAccountsDelegateChromeOS(user_profile)));
   }
   return accounts_delegates_.get(user_id);
 }
 
+void SystemTrayDelegateChromeOS::UserChangedSupervisedStatus(
+    user_manager::User* user) {
+  Profile* user_profile = ProfileHelper::Get()->GetProfileByUser(user);
+  DCHECK(user_profile);
+
+  if (session_started_ && user_profile_ == user_profile) {
+    ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
+        GetUserLoginStatus());
+  }
+}
+
 ash::SystemTray* SystemTrayDelegateChromeOS::GetPrimarySystemTray() {
   return ash::Shell::GetInstance()->GetPrimarySystemTray();
 }
 
 ash::SystemTrayNotifier* SystemTrayDelegateChromeOS::GetSystemTrayNotifier() {
   return ash::Shell::GetInstance()->system_tray_notifier();
 }
 
 void SystemTrayDelegateChromeOS::SetProfile(Profile* profile) {
   // Stop observing the AppWindowRegistry of the current |user_profile_|.
@@ skipping 239 matching lines @@
     }
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       if (UnsetProfile(content::Source<Profile>(source).ptr())) {
         registrar_->Remove(this,
                            chrome::NOTIFICATION_PROFILE_DESTROYED,
                            content::NotificationService::AllSources());
       }
       break;
     }
     case chrome::NOTIFICATION_SESSION_STARTED: {
+      session_started_ = true;
       ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
           GetUserLoginStatus());
       SetProfile(ProfileManager::GetActiveUserProfile());
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
@@ skipping 146 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos