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

Unified Diff: ash/aura/wm_root_window_controller_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/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/aura/wm_shelf_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index 90638cb66c56aa3afea204153bc4e0e2f589209e..37a43a8c7d91f2f69b57aaa8f554ceaa686eeafd 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -67,7 +67,7 @@ const WmRootWindowControllerAura* WmRootWindowControllerAura::Get(
}
bool WmRootWindowControllerAura::HasShelf() {
- return root_window_controller_->shelf_widget() != nullptr;
+ return root_window_controller_->wm_shelf_aura()->shelf_widget() != nullptr;
}
WmShell* WmRootWindowControllerAura::GetShell() {
« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/aura/wm_shelf_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698