Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 90f776c773746f7dc8e25d61f2cd929347b64e8b..822a69df04e4e8457d6ab8f463cda4ddb1be7693 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"
@@ -65,7 +64,6 @@ class SystemTrayDelegateChromeOS
public extensions::AppWindowRegistry::Observer,
public user_manager::UserManager::UserSessionStateObserver,
public SupervisedUserServiceObserver,
- public ShutdownPolicyHandler::Delegate,
public input_method::InputMethodManager::ImeMenuObserver {
public:
SystemTrayDelegateChromeOS();
@@ -118,12 +116,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;
@@ -221,9 +213,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;
@@ -256,14 +245,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);
« no previous file with comments | « chrome/browser/chromeos/shutdown_policy_browsertest.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698