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

Unified Diff: ash/mus/bridge/wm_shelf_mus.h

Issue 2304443002: ash: Move ShelfWidget ownership to WmShelf and refactor access to it (Closed)
Patch Set: review comments 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
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shelf_mus.h
diff --git a/ash/mus/bridge/wm_shelf_mus.h b/ash/mus/bridge/wm_shelf_mus.h
index 84ec6599a947607915edaf43de402f2d2d9153c6..b6c1bd75faba4f93ccbed8ebcea77e5fe64497de 100644
--- a/ash/mus/bridge/wm_shelf_mus.h
+++ b/ash/mus/bridge/wm_shelf_mus.h
@@ -10,24 +10,20 @@
namespace ash {
-class ShelfWidget;
-class WmRootWindowController;
+class WmWindow;
namespace mus {
// WmShelf implementation for mus.
class WmShelfMus : public WmShelf {
public:
- WmShelfMus(WmRootWindowController* root_window_controller);
+ explicit WmShelfMus(WmWindow* root_window);
~WmShelfMus() override;
// WmShelf:
void WillDeleteShelfLayoutManager() override;
private:
- // The shelf widget for this shelf.
- std::unique_ptr<ShelfWidget> shelf_widget_;
-
DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
};
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698