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

Unified Diff: ash/shelf/shelf_view.h

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_alignment_menu.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index c9a525e9e95237fa0ded421490f5271af90fbe18..6328de4dc75d3c590f4793eb37edd2acf2b40107 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -35,16 +35,17 @@ class MenuRunner;
}
namespace ash {
+class DragImageView;
+class OverflowBubble;
+class OverflowButton;
class Shelf;
+class ShelfButton;
class ShelfDelegate;
class ShelfIconObserver;
class ShelfItemDelegateManager;
class ShelfModel;
struct ShelfItem;
-class DragImageView;
-class OverflowBubble;
-class OverflowButton;
-class ShelfButton;
+class WmShelf;
namespace test {
class ShelfViewTestAPI;
@@ -63,7 +64,10 @@ class ASH_EXPORT ShelfView : public views::View,
public views::BoundsAnimatorObserver,
public app_list::ApplicationDragAndDropHost {
public:
- ShelfView(ShelfModel* model, ShelfDelegate* delegate, Shelf* shelf);
+ ShelfView(ShelfModel* model,
+ ShelfDelegate* delegate,
+ WmShelf* wm_shelf,
+ Shelf* shelf);
~ShelfView() override;
Shelf* shelf() const { return shelf_; }
@@ -321,6 +325,9 @@ class ASH_EXPORT ShelfView : public views::View,
// Delegate; owned by Launcher.
ShelfDelegate* delegate_;
+ // The shelf controller; owned by RootWindowController.
+ WmShelf* wm_shelf_;
+
// The shelf; owned by ShelfWidget.
Shelf* shelf_;
« no previous file with comments | « ash/shelf/shelf_alignment_menu.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698