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

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

Issue 2499523003: Add ink drop masking to TrayBackgroundView (Closed)
Patch Set: Addressed review comments Created 4 years, 1 month 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
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view); 132 void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
133 133
134 // ShelfBackgroundAnimatorObserver: 134 // ShelfBackgroundAnimatorObserver:
135 void UpdateShelfItemBackground(int alpha) override; 135 void UpdateShelfItemBackground(int alpha) override;
136 136
137 // Updates the visibility of this tray's separator. 137 // Updates the visibility of this tray's separator.
138 void SetSeparatorVisibility(bool is_show); 138 void SetSeparatorVisibility(bool is_show);
139 139
140 protected: 140 protected:
141 // ActionableView: 141 // ActionableView:
142 std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override;
142 bool ShouldEnterPushedState(const ui::Event& event) override; 143 bool ShouldEnterPushedState(const ui::Event& event) override;
143 bool PerformAction(const ui::Event& event) override; 144 bool PerformAction(const ui::Event& event) override;
144 void HandlePerformActionResult(bool action_performed, 145 void HandlePerformActionResult(bool action_performed,
145 const ui::Event& event) override; 146 const ui::Event& event) override;
146 gfx::Rect GetFocusBounds() override; 147 gfx::Rect GetFocusBounds() override;
147 148
148 private: 149 private:
149 class TrayWidgetObserver; 150 class TrayWidgetObserver;
150 151
151 // ui::ImplicitAnimationObserver: 152 // ui::ImplicitAnimationObserver:
(...skipping 27 matching lines...) Expand all
179 180
180 std::unique_ptr<TrayWidgetObserver> widget_observer_; 181 std::unique_ptr<TrayWidgetObserver> widget_observer_;
181 std::unique_ptr<TrayEventFilter> tray_event_filter_; 182 std::unique_ptr<TrayEventFilter> tray_event_filter_;
182 183
183 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 184 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
184 }; 185 };
185 186
186 } // namespace ash 187 } // namespace ash
187 188
188 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 189 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/tray/tray_background_view.cc » ('j') | ui/views/animation/ink_drop_host_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698