| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| index e76d94e195c3e84dc9da47a266994db8f45e612d..6720762a470a30d0930e933471a4184e5b7de1ad 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
|
| @@ -23,7 +23,6 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
|
| -#include "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
|
| #include "chrome/browser/ui/browser_list_observer.h"
|
| @@ -67,7 +66,6 @@ class SystemTrayDelegateChromeOS
|
| public extensions::AppWindowRegistry::Observer,
|
| public user_manager::UserManager::UserSessionStateObserver,
|
| public SupervisedUserServiceObserver,
|
| - public ShutdownPolicyHandler::Delegate,
|
| public input_method::InputMethodManager::ImeMenuObserver {
|
| public:
|
| SystemTrayDelegateChromeOS();
|
| @@ -120,12 +118,6 @@ class SystemTrayDelegateChromeOS
|
| ash::CustodianInfoTrayObserver* observer) override;
|
| void RemoveCustodianInfoTrayObserver(
|
| ash::CustodianInfoTrayObserver* observer) override;
|
| - void AddShutdownPolicyObserver(
|
| - ash::ShutdownPolicyObserver* observer) override;
|
| - void RemoveShutdownPolicyObserver(
|
| - ash::ShutdownPolicyObserver* observer) override;
|
| - void ShouldRebootOnShutdown(
|
| - const ash::RebootOnShutdownCallback& callback) override;
|
| ash::VPNDelegate* GetVPNDelegate() const override;
|
| std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
|
| ash::SystemTray* tray) override;
|
| @@ -232,9 +224,6 @@ class SystemTrayDelegateChromeOS
|
| void OnAccessibilityStatusChanged(
|
| const AccessibilityStatusEventDetails& details);
|
|
|
| - // Overridden from ShutdownPolicyObserver::Delegate.
|
| - void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
|
| -
|
| // input_method::InputMethodManager::ImeMenuObserver:
|
| void ImeMenuActivationChanged(bool is_active) override;
|
| void ImeMenuListChanged() override;
|
| @@ -267,14 +256,11 @@ class SystemTrayDelegateChromeOS
|
| std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
|
| std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
|
| std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
|
| - std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
|
| std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
|
|
|
| base::ObserverList<ash::CustodianInfoTrayObserver>
|
| custodian_info_changed_observers_;
|
|
|
| - base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
|
| -
|
| base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
|
|
|