Index: ash/wm/window_animations.cc |
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc |
index 66831b27469b20f4c13e2fe74575932383d149d9..e04c4b1ea9029e07ed5ce1160b29ec0ae8827ba7 100644 |
--- a/ash/wm/window_animations.cc |
+++ b/ash/wm/window_animations.cc |
@@ -397,7 +397,7 @@ void AnimateHideWindow_Workspace(aura::Window* window) { |
} |
gfx::Rect GetMinimizeRectForWindow(aura::Window* window) { |
- gfx::Rect target_bounds = Shell::GetInstance()->launcher()-> |
+ gfx::Rect target_bounds = Launcher::ForWindow(window)-> |
sky
2012/10/17 16:25:20
This should NULL check launcher.
oshima
2012/10/17 17:49:43
There wasn't null check. Why we need now?
sky
2012/10/17 21:22:56
It's a bug. The launcher is lazily created.
|
GetScreenBoundsOfItemIconForWindow(window); |
if (target_bounds.IsEmpty()) { |
// Assume the launcher is overflowed, zoom off to the bottom right of the |