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

Unified Diff: ash/shelf/shelf_view.h

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: cleanup Created 3 years, 7 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
Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 501b82a335d725739d0d232a4424046de281f2b8..50656eac6a156e5f8e7a2e24890a518c95e68ff0 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -43,11 +43,11 @@ class DragImageView;
class OverflowBubble;
class OverflowButton;
class ScopedRootWindowForNewWindows;
+class Shelf;
class ShelfButton;
class ShelfModel;
struct ShelfItem;
class ShelfWidget;
-class WmShelf;
namespace test {
class ShelfViewTestAPI;
@@ -69,12 +69,10 @@ class ASH_EXPORT ShelfView : public views::View,
public views::BoundsAnimatorObserver,
public app_list::ApplicationDragAndDropHost {
public:
- ShelfView(ShelfModel* model,
- WmShelf* wm_shelf,
- ShelfWidget* shelf_widget);
+ ShelfView(ShelfModel* model, Shelf* shelf, ShelfWidget* shelf_widget);
~ShelfView() override;
- WmShelf* wm_shelf() const { return wm_shelf_; }
+ Shelf* shelf() const { return shelf_; }
ShelfModel* model() const { return model_; }
void Init();
@@ -358,7 +356,7 @@ class ASH_EXPORT ShelfView : public views::View,
ShelfModel* model_;
// The shelf controller; owned by RootWindowController.
- WmShelf* wm_shelf_;
+ Shelf* shelf_;
// The shelf widget for this view. For overflow bubbles, this is the widget
// for the shelf, not for the bubble.

Powered by Google App Engine
This is Rietveld 408576698