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

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
+#include <vector>
+
 #include "ash/ime/input_method_menu_manager.h"
 #include "ash/session/session_state_observer.h"
+#include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
+#include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
+#include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/login/login_state.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 
 namespace chromeos {
 
 class SystemTrayDelegateChromeOS
     : public ash::ime::InputMethodMenuManager::Observer,
       public ash::SystemTrayDelegate,
       public SessionManagerClient::Observer,
       public content::NotificationObserver,
       public input_method::InputMethodManager::Observer,
       public chromeos::LoginState::Observer,
       public chromeos::CrasAudioHandler::AudioObserver,
       public device::BluetoothAdapter::Observer,
       public policy::CloudPolicyStore::Observer,
       public ash::SessionStateObserver,
       public chrome::BrowserListObserver,
-      public extensions::AppWindowRegistry::Observer {
+      public extensions::AppWindowRegistry::Observer,
+      public SupervisedUserServiceObserver {
  public:
   SystemTrayDelegateChromeOS();
 
   virtual ~SystemTrayDelegateChromeOS();
 
   void InitializeOnAdapterReady(
       scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Overridden from ash::SystemTrayDelegate:
   virtual void Initialize() override;
@@ skipping 60 matching lines @@
       scoped_ptr<ash::VolumeControlDelegate> delegate) override;
   virtual bool GetSessionStartTime(base::TimeTicks* session_start_time)
       override;
   virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit)
       override;
   virtual int GetSystemTrayMenuWidth() override;
   virtual void ActiveUserWasChanged() override;
   virtual bool IsSearchKeyMappedToCapsLock() override;
   virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
       const std::string& user_id) override;
+  virtual void AddCustodianInfoTrayObserver(
+      ash::CustodianInfoTrayObserver* observer) override;
+  virtual void RemoveCustodianInfoTrayObserver(
+      ash::CustodianInfoTrayObserver* observer) override;
 
   // browser tests need to call ShouldUse24HourClock().
   bool GetShouldUse24HourClockForTesting() const;
 
  private:
   // Should be the same as CrosSettings::ObserverSubscription.
   typedef base::CallbackList<void(void)>::Subscription
       CrosSettingsObserverSubscription;
 
   ash::SystemTray* GetPrimarySystemTray();
@@ skipping 11 matching lines @@
   void UpdateShowLogoutButtonInTray();
 
   void UpdateLogoutDialogDuration();
 
   void UpdateSessionStartTime();
 
   void UpdateSessionLengthLimit();
 
   void StopObservingAppWindowRegistry();
 
+  void StopObservingCustodianInfoChanges();
+
   // Notify observers if the current user has no more open browser or app
   // windows.
   void NotifyIfLastWindowClosed();
 
   // LoginState::Observer overrides.
   virtual void LoggedInStateChanged() override;
 
   // Overridden from SessionManagerClient::Observer.
   virtual void ScreenIsLocked() override;
   virtual void ScreenIsUnlocked() override;
@@ skipping 54 matching lines @@
 
   // Overridden from ash::SessionStateObserver
   virtual void UserAddedToSession(const std::string& user_id) override;
 
   // Overridden from chrome::BrowserListObserver:
   virtual void OnBrowserRemoved(Browser* browser) override;
 
   // Overridden from extensions::AppWindowRegistry::Observer:
   virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override;
 
+  // Overridden from SupervisedUserServiceObserver:
+  virtual void OnCustodianInfoChanged() OVERRIDE;

[Daniel Erat, 2014/10/08 14:10:46]

s/OVERRIDE/override/ to match the rest of this file

+
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
 
   scoped_ptr<content::NotificationRegistrar> registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
   scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
   Profile* user_profile_;
   base::HourClockType clock_type_;
   int search_key_mapped_to_;
   bool screen_locked_;
   bool have_session_start_time_;
   base::TimeTicks session_start_time_;
   bool have_session_length_limit_;
   base::TimeDelta session_length_limit_;
   std::string enterprise_domain_;
   bool should_run_bluetooth_discovery_;
 
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
   scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
   scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
   scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
   scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
   base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
       accounts_delegates_;
 
+  ObserverList<ash::CustodianInfoTrayObserver>
+      custodian_info_changed_observers_;
+
   base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
 
 }  // namespace chromeos
 #endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_