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 741417400d92b36e94da1bf267be46326569fde2..885fd61ed1caf110c52e00896d200a62bb9062ec 100644 |
| --- a/ash/common/system/tray/tray_background_view.h |
| +++ b/ash/common/system/tray/tray_background_view.h |
| @@ -24,7 +24,7 @@ class WmShelf; |
| // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray, |
| // LogoutButtonTray, OverviewButtonTray. |
| // This class handles setting and animating the background when the Launcher |
| -// his shown/hidden. It also inherits from ActionableView so that the tray |
| +// is shown/hidden. It also inherits from ActionableView so that the tray |
| // items can override PerformAction when clicked on. |
| class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| public ui::ImplicitAnimationObserver, |
| @@ -65,7 +65,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| DISALLOW_COPY_AND_ASSIGN(TrayContainer); |
| }; |
| - explicit TrayBackgroundView(WmShelf* wm_shelf); |
| + TrayBackgroundView(WmShelf* wm_shelf); |
|
James Cook
2016/08/19 00:55:50
nit: keep explicit, since there is one parameter
yiyix
2016/08/19 19:07:56
Done.
|
| ~TrayBackgroundView() override; |
| // Called after the tray has been added to the widget containing it. |
| @@ -80,6 +80,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| void ChildPreferredSizeChanged(views::View* child) override; |
| void GetAccessibleState(ui::AXViewState* state) override; |
| void AboutToRequestFocusFromTabTraversal(bool reverse) override; |
| + void OnPaint(gfx::Canvas* canvas) override; |
| // ActionableView: |
| bool PerformAction(const ui::Event& event) override; |
| @@ -138,13 +139,12 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| // ShelfBackgroundAnimatorObserver: |
| void UpdateShelfItemBackground(int alpha) override; |
| + // Updates the visibility of this tray's separator. |
| + void SetSeparatorVisibility(bool is_show); |
| + |
| private: |
| class TrayWidgetObserver; |
| - // Called from Initialize after all status area trays have been created. |
| - // Sets the border based on the position of the view. |
| - void SetTrayBorder(); |
| - |
| // ui::ImplicitAnimationObserver: |
| void OnImplicitAnimationsCompleted() override; |
| bool RequiresNotificationWhenAnimatorDestroyed() const override; |
| @@ -170,6 +170,8 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
| // differently if set to true. |
| bool draw_background_as_active_; |
| + // This variable stores the visibility of this tray's separator. |
|
varkha
2016/08/19 16:33:39
nit: Maybe just "Visibility of this tray's separat
yiyix
2016/08/19 19:07:56
Done.
|
| + bool is_separator_visible_; |
|
yoshiki
2016/08/19 03:45:31
nit: please add a blank line after this to keep co
yiyix
2016/08/19 19:07:56
Done.
|
| std::unique_ptr<TrayWidgetObserver> widget_observer_; |
| std::unique_ptr<TrayEventFilter> tray_event_filter_; |