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

Unified Diff: ash/shelf/shelf_widget.h

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WindowManager WmShell::Shutdown; delay PointerWatcherEventRouter teardown; cleanup shutdown wor… Created 4 years, 4 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 83bd7b2e403d273709488c5ee7906f534776179e..caea889ca56596e66bbc0f5665389c7739013807 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -22,7 +22,7 @@ class Shelf;
class ShelfLayoutManager;
class ShelfView;
class StatusAreaWidget;
-class WmShelfAura;
+class WmShelf;
class WmWindow;
class ASH_EXPORT ShelfWidget : public views::Widget,
@@ -32,7 +32,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
public:
ShelfWidget(WmWindow* shelf_container,
WmWindow* status_container,
- WmShelfAura* wm_shelf_aura);
+ WmShelf* wm_shelf);
~ShelfWidget() override;
// Returns if shelf alignment option is enabled, and the user is able to
@@ -110,9 +110,9 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
class DelegateView;
friend class DelegateView;
- WmShelfAura* wm_shelf_aura_;
+ WmShelf* wm_shelf_;
- // Owned by the shelf container's aura::Window.
+ // Owned by the shelf container's window.
ShelfLayoutManager* shelf_layout_manager_;
// Owned by the root window controller.
Shelf* shelf_;

Powered by Google App Engine
This is Rietveld 408576698