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

Side by Side Diff: ash/shelf/shelf.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/app_list_button.cc ('k') | ash/shelf/shelf.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_H_ 5 #ifndef ASH_SHELF_SHELF_H_
6 #define ASH_SHELF_SHELF_H_ 6 #define ASH_SHELF_SHELF_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 17 matching lines...) Expand all
28 28
29 namespace gfx { 29 namespace gfx {
30 class Rect; 30 class Rect;
31 } 31 }
32 32
33 namespace views { 33 namespace views {
34 class View; 34 class View;
35 } 35 }
36 36
37 namespace ash { 37 namespace ash {
38 class AppListButton;
38 class FocusCycler; 39 class FocusCycler;
39 class ShelfDelegate; 40 class ShelfDelegate;
40 class ShelfIconObserver; 41 class ShelfIconObserver;
41 class ShelfModel; 42 class ShelfModel;
42 class ShelfView; 43 class ShelfView;
43 class WmShelf; 44 class WmShelf;
44 45
45 namespace test { 46 namespace test {
46 class ShelfTestAPI; 47 class ShelfTestAPI;
47 } 48 }
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Returns true if the shelf is showing a context menu. 126 // Returns true if the shelf is showing a context menu.
126 bool IsShowingMenu() const; 127 bool IsShowingMenu() const;
127 128
128 bool IsShowingOverflowBubble() const; 129 bool IsShowingOverflowBubble() const;
129 130
130 void SetVisible(bool visible) const; 131 void SetVisible(bool visible) const;
131 bool IsVisible() const; 132 bool IsVisible() const;
132 133
133 void SchedulePaint(); 134 void SchedulePaint();
134 135
135 views::View* GetAppListButtonView() const; 136 AppListButton* GetAppListButton() const;
136 137
137 // Launch a 0-indexed shelf item in the shelf. 138 // Launch a 0-indexed shelf item in the shelf.
138 // A negative index launches the last shelf item in the shelf. 139 // A negative index launches the last shelf item in the shelf.
139 void LaunchAppIndexAt(int item_index); 140 void LaunchAppIndexAt(int item_index);
140 141
141 ShelfWidget* shelf_widget() { return shelf_widget_; } 142 ShelfWidget* shelf_widget() { return shelf_widget_; }
142 143
143 // TODO(msw): ShelfLayoutManager should not be accessed externally. 144 // TODO(msw): ShelfLayoutManager should not be accessed externally.
144 ShelfLayoutManager* shelf_layout_manager() { 145 ShelfLayoutManager* shelf_layout_manager() {
145 return shelf_widget_->shelf_layout_manager(); 146 return shelf_widget_->shelf_layout_manager();
(...skipping 18 matching lines...) Expand all
164 165
165 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM; 166 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
166 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; 167 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
167 168
168 DISALLOW_COPY_AND_ASSIGN(Shelf); 169 DISALLOW_COPY_AND_ASSIGN(Shelf);
169 }; 170 };
170 171
171 } // namespace ash 172 } // namespace ash
172 173
173 #endif // ASH_SHELF_SHELF_H_ 174 #endif // ASH_SHELF_SHELF_H_
OLDNEW
« no previous file with comments | « ash/shelf/app_list_button.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698