| 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 a6a308a419a92075b69ce44f30f9b8f8b982591b..9bc81c614f5964673db657c6a10cc96fc43dd117 100644
|
| --- a/ash/common/system/tiles/tiles_default_view.h
|
| +++ b/ash/common/system/tiles/tiles_default_view.h
|
| @@ -5,13 +5,19 @@
|
| #ifndef ASH_COMMON_SYSTEM_TILES_TILES_DEFAULT_VIEW_H_
|
| #define ASH_COMMON_SYSTEM_TILES_TILES_DEFAULT_VIEW_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"
|
|
|
| +namespace views {
|
| +class CustomButton;
|
| +}
|
| +
|
| namespace ash {
|
| +class SystemMenuButton;
|
| class SystemTrayItem;
|
|
|
| // The container view for the tiles in the bottom row of the system menu
|
| @@ -20,7 +26,7 @@ class TilesDefaultView : public views::View,
|
| public views::ButtonListener,
|
| public ShutdownPolicyObserver {
|
| public:
|
| - explicit TilesDefaultView(SystemTrayItem* owner);
|
| + TilesDefaultView(SystemTrayItem* owner, LoginStatus login);
|
| ~TilesDefaultView() override;
|
|
|
| // Sets the layout manager and child views of |this|.
|
| @@ -35,6 +41,8 @@ class TilesDefaultView : public views::View,
|
| void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
|
|
|
| private:
|
| + friend class TrayTilesTest;
|
| +
|
| // Helper function to add a separator line between two tiles.
|
| // TODO(tdanderson|bruthig): Consider moving this to a location which can be
|
| // shared by other system menu rows.
|
| @@ -42,13 +50,15 @@ class TilesDefaultView : public views::View,
|
|
|
| SystemTrayItem* owner_;
|
|
|
| + LoginStatus login_;
|
| +
|
| // Pointers to the child buttons of |this|. Note that some buttons may not
|
| // exist (depending on the user's current login status, for instance), in
|
| // which case the corresponding pointer will be null.
|
| - views::Button* settings_button_;
|
| - views::Button* help_button_;
|
| - views::Button* lock_button_;
|
| - views::Button* power_button_;
|
| + views::CustomButton* settings_button_;
|
| + views::CustomButton* help_button_;
|
| + views::CustomButton* lock_button_;
|
| + views::CustomButton* power_button_;
|
|
|
| base::WeakPtrFactory<TilesDefaultView> weak_factory_;
|
|
|
|
|