Chromium Code Reviews| 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..0caf569b7b219c238fd03723b7ffdd09e2183fd3 100644 |
| --- a/ash/common/system/tiles/tiles_default_view.h |
| +++ b/ash/common/system/tiles/tiles_default_view.h |
| @@ -5,6 +5,7 @@ |
| #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" |
| @@ -12,6 +13,7 @@ |
| #include "ui/views/view.h" |
| namespace ash { |
| +class SystemMenuButton; |
| class SystemTrayItem; |
| // The container view for the tiles in the bottom row of the system menu |
| @@ -20,7 +22,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|. |
| @@ -42,13 +44,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_; |
| + SystemMenuButton* settings_button_; |
|
bruthig
2016/10/19 15:43:09
Can these be typed as CustomButton?
tdanderson
2016/10/19 19:49:31
Done.
|
| + SystemMenuButton* help_button_; |
| + SystemMenuButton* lock_button_; |
| + SystemMenuButton* power_button_; |
| base::WeakPtrFactory<TilesDefaultView> weak_factory_; |