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

Unified Diff: ash/common/system/date/date_default_view.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
« no previous file with comments | « ash/common/system/chromeos/shutdown_policy_observer.h ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/date/date_default_view.h
diff --git a/ash/common/system/date/date_default_view.h b/ash/common/system/date/date_default_view.h
index 4e490328d17f2eacd305dfa0b6e4f54aa4edf749..6adaee0b61513f7dfc5cf69ed4ad6862fd289ee1 100644
--- a/ash/common/system/date/date_default_view.h
+++ b/ash/common/system/date/date_default_view.h
@@ -7,9 +7,7 @@
#include "ash/ash_export.h"
#include "ash/common/login_status.h"
-#include "ash/common/system/chromeos/shutdown_policy_observer.h"
#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/view.h"
@@ -26,8 +24,7 @@ class TrayPopupHeaderButton;
// TODO(tdanderson): Remove this class once material design is enabled by
// default. See crbug.com/614453.
class ASH_EXPORT DateDefaultView : public views::View,
- public views::ButtonListener,
- public ShutdownPolicyObserver {
+ public views::ButtonListener {
public:
DateDefaultView(SystemTrayItem* owner, LoginStatus login);
@@ -39,9 +36,6 @@ class ASH_EXPORT DateDefaultView : public views::View,
tray::DateView* GetDateView();
const tray::DateView* GetDateView() const;
- // ash::ShutdownPolicyObserver:
- void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
-
private:
// Overridden from views::ButtonListener.
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
@@ -51,8 +45,6 @@ class ASH_EXPORT DateDefaultView : public views::View,
TrayPopupHeaderButton* lock_button_;
tray::DateView* date_view_;
- base::WeakPtrFactory<DateDefaultView> weak_factory_;
-
DISALLOW_COPY_AND_ASSIGN(DateDefaultView);
};
« no previous file with comments | « ash/common/system/chromeos/shutdown_policy_observer.h ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698