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

Side by Side Diff: ash/shelf/shelf_view.h

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Rebased Created 4 years, 5 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/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_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_SHELF_SHELF_VIEW_H_ 5 #ifndef ASH_SHELF_SHELF_VIEW_H_
6 #define ASH_SHELF_SHELF_VIEW_H_ 6 #define ASH_SHELF_SHELF_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 19 matching lines...) Expand all
30 namespace ui { 30 namespace ui {
31 class MenuModel; 31 class MenuModel;
32 } 32 }
33 33
34 namespace views { 34 namespace views {
35 class BoundsAnimator; 35 class BoundsAnimator;
36 class MenuRunner; 36 class MenuRunner;
37 } 37 }
38 38
39 namespace ash { 39 namespace ash {
40 class AppListButton;
40 class DragImageView; 41 class DragImageView;
41 class OverflowBubble; 42 class OverflowBubble;
42 class OverflowButton; 43 class OverflowButton;
43 class Shelf; 44 class Shelf;
44 class ShelfButton; 45 class ShelfButton;
45 class ShelfDelegate; 46 class ShelfDelegate;
46 class ShelfIconObserver; 47 class ShelfIconObserver;
47 class ShelfItemDelegateManager; 48 class ShelfItemDelegateManager;
48 class ShelfModel; 49 class ShelfModel;
49 struct ShelfItem; 50 struct ShelfItem;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 97
97 // Returns true if overflow bubble is shown. 98 // Returns true if overflow bubble is shown.
98 bool IsShowingOverflowBubble() const; 99 bool IsShowingOverflowBubble() const;
99 100
100 // Sets owner overflow bubble instance from which this shelf view pops 101 // Sets owner overflow bubble instance from which this shelf view pops
101 // out as overflow. 102 // out as overflow.
102 void set_owner_overflow_bubble(OverflowBubble* owner) { 103 void set_owner_overflow_bubble(OverflowBubble* owner) {
103 owner_overflow_bubble_ = owner; 104 owner_overflow_bubble_ = owner;
104 } 105 }
105 106
106 views::View* GetAppListButtonView() const; 107 AppListButton* GetAppListButton() const;
107 108
108 // Returns true if the mouse cursor exits the area for launcher tooltip. 109 // Returns true if the mouse cursor exits the area for launcher tooltip.
109 // There are thin gaps between launcher buttons but the tooltip shouldn't hide 110 // There are thin gaps between launcher buttons but the tooltip shouldn't hide
110 // in the gaps, but the tooltip should hide if the mouse moved totally outside 111 // in the gaps, but the tooltip should hide if the mouse moved totally outside
111 // of the buttons area. 112 // of the buttons area.
112 bool ShouldHideTooltip(const gfx::Point& cursor_location) const; 113 bool ShouldHideTooltip(const gfx::Point& cursor_location) const;
113 114
114 // Returns true if a tooltip should be shown for the shelf item |view|. 115 // Returns true if a tooltip should be shown for the shelf item |view|.
115 bool ShouldShowTooltipForView(const views::View* view) const; 116 bool ShouldShowTooltipForView(const views::View* view) const;
116 117
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 462
462 // Tracks UMA metrics based on shelf button press actions. 463 // Tracks UMA metrics based on shelf button press actions.
463 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 464 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
464 465
465 DISALLOW_COPY_AND_ASSIGN(ShelfView); 466 DISALLOW_COPY_AND_ASSIGN(ShelfView);
466 }; 467 };
467 468
468 } // namespace ash 469 } // namespace ash
469 470
470 #endif // ASH_SHELF_SHELF_VIEW_H_ 471 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698