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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/wm_shelf.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Sync and rebase. 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
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/shelf/wm_shelf.h ('k') | ash/shell.h » ('j') | ash/shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/wm_shelf.cc
diff --git a/ash/shelf/wm_shelf.cc b/ash/shelf/wm_shelf.cc
index 57719054ccb4191d657e400ecd254f244f916ff9..7db37c0ecfaa82a7751074cf48370331de84dc35 100644
--- a/ash/shelf/wm_shelf.cc
+++ b/ash/shelf/wm_shelf.cc
@@ -69,8 +69,8 @@ WmShelf::WmShelf() {}
WmShelf::~WmShelf() {}
// static
-WmShelf* WmShelf::ForWindow(WmWindow* window) {
- return window->GetRootWindowController()->GetShelf();
+WmShelf* WmShelf::ForWindow(aura::Window* window) {
+ return GetRootWindowController(window)->GetShelf();
}
// static
« ash/shelf/shelf_widget_unittest.cc ('K') | « ash/shelf/wm_shelf.h ('k') | ash/shell.h » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698