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

Unified Diff: ash/aura/wm_shelf_aura.cc

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/aura/wm_shelf_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shelf_aura.cc
diff --git a/ash/aura/wm_shelf_aura.cc b/ash/aura/wm_shelf_aura.cc
index 33c5d02d87f7f9e76ab70ef334e86d76508bfab9..36e428e081507b0f7053c43d5bac6c1bcc495646 100644
--- a/ash/aura/wm_shelf_aura.cc
+++ b/ash/aura/wm_shelf_aura.cc
@@ -51,8 +51,8 @@ WmDimmerView* WmShelfAura::CreateDimmerView(bool disable_animations_for_test) {
return DimmerView::Create(this, disable_animations_for_test);
}
-void WmShelfAura::SetShelfLayoutManager(ShelfLayoutManager* manager) {
- WmShelf::SetShelfLayoutManager(manager);
+void WmShelfAura::CreateShelfWidget(WmWindow* root) {
+ WmShelf::CreateShelfWidget(root);
bezel_event_handler_.reset(new ShelfBezelEventHandler(this));
}
« no previous file with comments | « ash/aura/wm_shelf_aura.h ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698