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

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: Fix WmShelf::ForWindow. 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
« no previous file with comments | « ash/shelf/wm_shelf.h ('k') | ash/shell.h » ('j') | no next file with comments »
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 2620c8c0b9b512d60b74e80bc0316ce349828600..c47d951f8070344054623d5cafd6224b72795e8e 100644
--- a/ash/shelf/wm_shelf.cc
+++ b/ash/shelf/wm_shelf.cc
@@ -73,8 +73,8 @@ WmShelf::WmShelf() : shelf_locking_manager_(this) {
WmShelf::~WmShelf() {}
// static
-WmShelf* WmShelf::ForWindow(WmWindow* window) {
- return window->GetRootWindowController()->GetShelf();
+WmShelf* WmShelf::ForWindow(aura::Window* window) {
+ return GetRootWindowController(window->GetRootWindow())->GetShelf();
}
// static
« no previous file with comments | « ash/shelf/wm_shelf.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698