Chromium Code Reviews| Index: ash/common/system/tray/tray_background_view.h |
| diff --git a/ash/common/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h |
| index b642ca692d688ae12e4acb071bea3796d18a2891..d7879f072324b2e1d5414ced0b40defb32951e15 100644 |
| --- a/ash/common/system/tray/tray_background_view.h |
| +++ b/ash/common/system/tray/tray_background_view.h |
| @@ -78,7 +78,13 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| void OnPaint(gfx::Canvas* canvas) override; |
| // ActionableView: |
| + std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override; |
| + std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() |
| + const override; |
| + bool ShouldEnterPushedState(const ui::Event& event) override; |
| bool PerformAction(const ui::Event& event) override; |
| + void HandlePerformActionResult(bool action_performed, |
| + const ui::Event& event) override; |
| gfx::Rect GetFocusBounds() override; |
| void OnGestureEvent(ui::GestureEvent* event) override; |
| @@ -105,8 +111,9 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| // Sets |contents| as a child. |
| void SetContents(views::View* contents); |
| - // Creates and sets contents background to |background_|. |
| - void SetContentsBackground(); |
| + // Creates and sets contents background to |background_|. |draws_active| |
| + // determines if the view needs its active background drawn. |
|
tdanderson
2016/11/12 02:18:58
nit: I think a clearer wording would be "|draws_ac
mohsen
2016/11/13 05:10:04
Done.
|
| + void SetContentsBackground(bool draws_active); |
| // Returns the anchor rect for the bubble. |
| gfx::Rect GetBubbleAnchorRect( |
| @@ -117,11 +124,8 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| // Returns the bubble anchor alignment based on |shelf_alignment_|. |
| views::TrayBubbleView::AnchorAlignment GetAnchorAlignment() const; |
| - // Forces the background to be drawn active if set to true. |
| - void SetDrawBackgroundAsActive(bool visible); |
| - |
| - // Returns true when the the background was overridden to be drawn as active. |
| - bool draw_background_as_active() const { return draw_background_as_active_; } |
| + void SetIsActive(bool is_active); |
| + bool is_active() const { return is_active_; } |
| TrayContainer* tray_container() const { return tray_container_; } |
| ShelfAlignment shelf_alignment() const { return shelf_alignment_; } |
| @@ -161,9 +165,9 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| // Owned by the view passed to SetContents(). |
| TrayBackground* background_; |
| - // This variable stores the activation override which will tint the background |
| - // differently if set to true. |
| - bool draw_background_as_active_; |
| + // Determines if the view is active. This changes how the background is drawn |
| + // in non-MD version and how the ink drop ripples behave in MD version. |
| + bool is_active_; |
| // Visibility of this tray's separator which is a line of 1x32px and 4px to |
| // right of tray. |