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

Unified Diff: ash/shelf/shelf_widget.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_widget.h
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
index 66d5d4759b33ead87de7e290ed9a2232968423a5..9a6353fef7d2b6870f6a657678020ae0756ccdde 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -24,10 +24,10 @@ namespace ash {
enum class AnimationChangeType;
class AppListButton;
class FocusCycler;
+class Shelf;
class ShelfLayoutManager;
class ShelfView;
class StatusAreaWidget;
-class WmShelf;
class WmWindow;
// The ShelfWidget manages the shelf view (which contains the shelf icons) and
@@ -38,7 +38,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
public ShelfBackgroundAnimatorObserver,
public ShelfLayoutManagerObserver {
public:
- ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf);
+ ShelfWidget(WmWindow* shelf_container, Shelf* shelf);
~ShelfWidget() override;
void CreateStatusAreaWidget(WmWindow* status_container);
@@ -75,10 +75,10 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
// Clean up prior to deletion.
void Shutdown();
- // See WmShelf::UpdateIconPositionForPanel().
+ // See Shelf::UpdateIconPositionForPanel().
void UpdateIconPositionForPanel(WmWindow* panel);
- // See WmShelf::GetScreenBoundsOfItemIconForWindow().
+ // See Shelf::GetScreenBoundsOfItemIconForWindow().
gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window);
// Returns the button that opens the app launcher.
@@ -103,7 +103,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
class DelegateView;
friend class DelegateView;
- WmShelf* wm_shelf_;
+ Shelf* shelf_;
// Owned by the shelf container's window.
ShelfLayoutManager* shelf_layout_manager_;

Powered by Google App Engine
This is Rietveld 408576698