Adding infrastructure for possibility of changing manager names for the supervised accounts.

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 52 matching lines @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
@@ skipping 218 matching lines @@
   ash::Shell::GetInstance()
       ->session_state_delegate()
       ->RemoveSessionStateObserver(this);
   LoginState::Get()->RemoveObserver(this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->RemoveAudioObserver(this);
 
   BrowserList::RemoveObserver(this);
   StopObservingAppWindowRegistry();
+  StopObservingCustodianInfoChanges();
 
   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);
 }
 
 // Overridden from ash::SystemTrayDelegate:
@@ skipping 46 matching lines @@
 }
 
 const base::string16 SystemTrayDelegateChromeOS::GetEnterpriseMessage() const {
   if (GetEnterpriseDomain().empty())
     return base::string16();
   return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
                                     base::UTF8ToUTF16(GetEnterpriseDomain()));
 }
 
 const std::string SystemTrayDelegateChromeOS::GetSupervisedUserManager() const {
-  if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
+  if (!IsUserSupervised())
     return std::string();
-  return ChromeUserManager::Get()
-      ->GetSupervisedUserManager()
-      ->GetManagerDisplayEmail(
-          user_manager::UserManager::Get()->GetActiveUser()->email());
+  return SupervisedUserServiceFactory::GetForProfile(user_profile_)->
+      GetCustodianEmailAddress();
 }
 
 const base::string16
 SystemTrayDelegateChromeOS::GetSupervisedUserManagerName() const {
-  if (GetUserLoginStatus() != ash::user::LOGGED_IN_SUPERVISED)
+  if (!IsUserSupervised())
     return base::string16();
-  return ChromeUserManager::Get()
-      ->GetSupervisedUserManager()
-      ->GetManagerDisplayName(
-          user_manager::UserManager::Get()->GetActiveUser()->email());
+  return base::UTF8ToUTF16(SupervisedUserServiceFactory::GetForProfile(
+      user_profile_)->GetCustodianName());
 }
 
 const base::string16 SystemTrayDelegateChromeOS::GetSupervisedUserMessage()
     const {
   if (!IsUserSupervised())
     return base::string16();
+  std::string user_manager_name = GetSupervisedUserManager();
+  LOG_IF(WARNING, user_manager_name.empty()) <<
+      "Returning incomplete supervised user message as manager not known yet.";
   return l10n_util::GetStringFUTF16(
       IDS_USER_IS_SUPERVISED_BY_NOTICE,
-      base::UTF8ToUTF16(GetSupervisedUserManager()));
+      base::UTF8ToUTF16(user_manager_name));
 }
 
 bool SystemTrayDelegateChromeOS::IsUserSupervised() const {
   user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
   return user && user->IsSupervised();
 }
 
 bool SystemTrayDelegateChromeOS::SystemShouldUpgrade() const {
   return UpgradeDetector::GetInstance()->notify_upgrade();
 }
@@ skipping 450 matching lines @@
 }
 
 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_|.
   StopObservingAppWindowRegistry();
 
+  // Stop observing custodian info changes of the current |user_profile_|.
+  StopObservingCustodianInfoChanges();
+
   user_profile_ = profile;
 
   // Start observing the AppWindowRegistry of the newly set |user_profile_|.
   extensions::AppWindowRegistry::Get(user_profile_)->AddObserver(this);
 
+  // Start observing custodian info changes of the newly set |user_profile_|.
+  SupervisedUserServiceFactory::GetForProfile(profile)->AddObserver(this);
+
   PrefService* prefs = profile->GetPrefs();
   user_pref_registrar_.reset(new PrefChangeRegistrar);
   user_pref_registrar_->Init(prefs);
   user_pref_registrar_->Add(
       prefs::kUse24HourClock,
       base::Bind(&SystemTrayDelegateChromeOS::UpdateClockType,
                  base::Unretained(this)));
   user_pref_registrar_->Add(
       prefs::kLanguageRemapSearchKeyTo,
       base::Bind(&SystemTrayDelegateChromeOS::OnLanguageRemapSearchKeyToChanged,
@@ skipping 23 matching lines @@
                  ash::A11Y_NOTIFICATION_NONE));
   user_pref_registrar_->Add(
       prefs::kPerformanceTracingEnabled,
       base::Bind(&SystemTrayDelegateChromeOS::UpdatePerformanceTracing,
                  base::Unretained(this)));
 
   UpdateClockType();
   UpdateShowLogoutButtonInTray();
   UpdateLogoutDialogDuration();
   UpdatePerformanceTracing();
+  OnCustodianInfoChanged();
   search_key_mapped_to_ =
       profile->GetPrefs()->GetInteger(prefs::kLanguageRemapSearchKeyTo);
 }
 
 bool SystemTrayDelegateChromeOS::UnsetProfile(Profile* profile) {
   if (profile != user_profile_)
     return false;
   user_pref_registrar_.reset();
   user_profile_ = NULL;
   return true;
@@ skipping 84 matching lines @@
   if (!user_profile_)
     return;
 
   extensions::AppWindowRegistry* registry =
       extensions::AppWindowRegistry::Factory::GetForBrowserContext(
           user_profile_, false);
   if (registry)
     registry->RemoveObserver(this);
 }
 
+void SystemTrayDelegateChromeOS::StopObservingCustodianInfoChanges() {
+  if (!user_profile_)
+    return;
+
+  SupervisedUserService* service = SupervisedUserServiceFactory::GetForProfile(
+      user_profile_);
+  if (service)
+    service->RemoveObserver(this);
+}
+
 void SystemTrayDelegateChromeOS::NotifyIfLastWindowClosed() {
   if (!user_profile_)
     return;
 
   BrowserList* browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end();
        ++it) {
     if ((*it)->profile()->IsSameProfile(user_profile_)) {
@@ skipping 248 matching lines @@
 void SystemTrayDelegateChromeOS::OnBrowserRemoved(Browser* browser) {
   NotifyIfLastWindowClosed();
 }
 
 // Overridden from extensions::AppWindowRegistry::Observer.
 void SystemTrayDelegateChromeOS::OnAppWindowRemoved(
     extensions::AppWindow* app_window) {
   NotifyIfLastWindowClosed();
 }
 
+// Overridden from SupervisedUserServiceObserver.
+void SystemTrayDelegateChromeOS::OnCustodianInfoChanged() {
+  FOR_EACH_OBSERVER(
+      ash::CustodianInfoTrayObserver, custodian_info_changed_observers_,
+      OnCustodianInfoChanged());
+}
+
+void SystemTrayDelegateChromeOS::AddObserver(

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

please move this and RemoveObserver so they match the order in the .h file

[merkulova, 2014/10/08 09:19:37]

Done.

+    ash::CustodianInfoTrayObserver* observer) {
+  custodian_info_changed_observers_.AddObserver(observer);
+}
+
+void SystemTrayDelegateChromeOS::RemoveObserver(
+    ash::CustodianInfoTrayObserver* observer) {
+  custodian_info_changed_observers_.RemoveObserver(observer);
+}
+
 void SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged(
     const AccessibilityStatusEventDetails& details) {
   if (details.notification_type == ACCESSIBILITY_MANAGER_SHUTDOWN)
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos