Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Side by Side Diff: ash/common/system/tray/tray_background_view.h

Issue 2618383003: Remove the extra separator appears on the right side of the shelf (Closed)
Patch Set: address nits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 ShelfAlignment shelf_alignment() const { return shelf_alignment_; } 121 ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
122 TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); } 122 TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); }
123 WmShelf* shelf() { return wm_shelf_; } 123 WmShelf* shelf() { return wm_shelf_; }
124 124
125 // Updates the arrow visibility based on the launcher visibility. 125 // Updates the arrow visibility based on the launcher visibility.
126 void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view); 126 void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
127 127
128 // ShelfBackgroundAnimatorObserver: 128 // ShelfBackgroundAnimatorObserver:
129 void UpdateShelfItemBackground(int alpha) override; 129 void UpdateShelfItemBackground(int alpha) override;
130 130
131 // Updates the visibility of this tray's separator.
132 void set_separator_visibility(bool visible) {
James Cook 2017/01/10 01:04:42 nit: I gave you bad advice. :-) For inline setter
133 is_separator_visible_ = visible;
134 }
135
131 // Gets the anchor for bubbles, which is tray_container(). 136 // Gets the anchor for bubbles, which is tray_container().
132 views::View* GetBubbleAnchor() const; 137 views::View* GetBubbleAnchor() const;
133 138
134 // Gets additional insets for positioning bubbles relative to 139 // Gets additional insets for positioning bubbles relative to
135 // tray_container(). 140 // tray_container().
136 gfx::Insets GetBubbleAnchorInsets() const; 141 gfx::Insets GetBubbleAnchorInsets() const;
137 142
138 protected: 143 protected:
139 // ActionableView: 144 // ActionableView:
140 std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override; 145 std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // TODO(jamescook): Don't cache this, get it from WmShelf. 177 // TODO(jamescook): Don't cache this, get it from WmShelf.
173 ShelfAlignment shelf_alignment_; 178 ShelfAlignment shelf_alignment_;
174 179
175 // Owned by the view passed to SetContents(). 180 // Owned by the view passed to SetContents().
176 TrayBackground* background_; 181 TrayBackground* background_;
177 182
178 // Determines if the view is active. This changes how the background is drawn 183 // Determines if the view is active. This changes how the background is drawn
179 // in non-MD version and how the ink drop ripples behave in MD version. 184 // in non-MD version and how the ink drop ripples behave in MD version.
180 bool is_active_; 185 bool is_active_;
181 186
187 // Visibility of this tray's separator which is a line of 1x32px and 4px to
188 // right of tray.
189 bool is_separator_visible_;
190
182 std::unique_ptr<TrayWidgetObserver> widget_observer_; 191 std::unique_ptr<TrayWidgetObserver> widget_observer_;
183 std::unique_ptr<TrayEventFilter> tray_event_filter_; 192 std::unique_ptr<TrayEventFilter> tray_event_filter_;
184 193
185 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 194 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
186 }; 195 };
187 196
188 } // namespace ash 197 } // namespace ash
189 198
190 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 199 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698