| Index: ash/common/system/tiles/tiles_default_view.h
|
| diff --git a/ash/common/system/tiles/tiles_default_view.h b/ash/common/system/tiles/tiles_default_view.h
|
| index 19140c859b0f3c9d3cce96477f4eb032a94f874d..fd59a2cbc9f6de5fa91e682a1254eb4c8526ffa6 100644
|
| --- a/ash/common/system/tiles/tiles_default_view.h
|
| +++ b/ash/common/system/tiles/tiles_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"
|
|
|
| @@ -24,8 +22,7 @@ class SystemTrayItem;
|
| // The container view for the tiles in the bottom row of the system menu
|
| // (settings, help, lock, and power).
|
| class ASH_EXPORT TilesDefaultView : public views::View,
|
| - public views::ButtonListener,
|
| - public ShutdownPolicyObserver {
|
| + public views::ButtonListener {
|
| public:
|
| TilesDefaultView(SystemTrayItem* owner, LoginStatus login);
|
| ~TilesDefaultView() override;
|
| @@ -38,9 +35,6 @@ class ASH_EXPORT TilesDefaultView : public views::View,
|
| // views::ButtonListener:
|
| void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| - // ShutdownPolicyObserver:
|
| - void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
|
| -
|
| // Accessor needed to obtain the help button view for the first-run flow.
|
| views::View* GetHelpButtonView() const;
|
|
|
| @@ -60,8 +54,6 @@ class ASH_EXPORT TilesDefaultView : public views::View,
|
| views::CustomButton* lock_button_;
|
| views::CustomButton* power_button_;
|
|
|
| - base::WeakPtrFactory<TilesDefaultView> weak_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(TilesDefaultView);
|
| };
|
|
|
|
|