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

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

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 years, 9 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/status_area_widget.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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 TrayContainer* tray_container() const { return tray_container_; } 120 TrayContainer* tray_container() const { return tray_container_; }
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(SkColor color) override;
130 130
131 // Updates the visibility of this tray's separator. 131 // Updates the visibility of this tray's separator.
132 void set_separator_visibility(bool visible) { separator_visible_ = visible; } 132 void set_separator_visibility(bool visible) { separator_visible_ = visible; }
133 133
134 // Gets the anchor for bubbles, which is tray_container(). 134 // Gets the anchor for bubbles, which is tray_container().
135 views::View* GetBubbleAnchor() const; 135 views::View* GetBubbleAnchor() const;
136 136
137 // Gets additional insets for positioning bubbles relative to 137 // Gets additional insets for positioning bubbles relative to
138 // tray_container(). 138 // tray_container().
139 gfx::Insets GetBubbleAnchorInsets() const; 139 gfx::Insets GetBubbleAnchorInsets() const;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 std::unique_ptr<TrayWidgetObserver> widget_observer_; 189 std::unique_ptr<TrayWidgetObserver> widget_observer_;
190 std::unique_ptr<TrayEventFilter> tray_event_filter_; 190 std::unique_ptr<TrayEventFilter> tray_event_filter_;
191 191
192 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 192 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
193 }; 193 };
194 194
195 } // namespace ash 195 } // namespace ash
196 196
197 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 197 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/system/status_area_widget.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