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

Unified Diff: ash/wm/window_animations.cc

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move shelf notify functions to WmShell. 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
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 948f5bfa12044e53276a08fea0e9aa46548f8f15..1a6ae8c72e6d32201858ce72335eeae036296eb1 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -9,6 +9,7 @@
#include <utility>
#include <vector>
+#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/window_animation_types.h"
#include "ash/screen_util.h"
#include "ash/shelf/shelf.h"
@@ -433,11 +434,12 @@ CreateBrightnessGrayscaleAnimationSequence(float target_value,
}
gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
- Shelf* shelf = Shelf::ForWindow(window);
+ WmWindow* wm_window = WmWindowAura::Get(window);
+ Shelf* shelf = Shelf::ForWindow(wm_window);
// Shelf is created lazily and can be NULL.
if (!shelf)
return gfx::Rect();
- gfx::Rect item_rect = shelf->GetScreenBoundsOfItemIconForWindow(window);
+ gfx::Rect item_rect = shelf->GetScreenBoundsOfItemIconForWindow(wm_window);
// The launcher item is visible and has an icon.
if (!item_rect.IsEmpty())
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698