Remove Shell::shelf()|status_area_widget()|launcher()

ash/wm/window_animations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/window_animations.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 379 matching lines @@
     window->layer()->SetTransform(transform);
     settings.SetTransitionDuration(settings.GetTransitionDuration() / 2);
     window->layer()->SetOpacity(1.0f);
     window->layer()->SetOpacity(0.0f);
   }
   animator->set_preemption_strategy(
       ui::LayerAnimator::IMMEDIATELY_SET_NEW_TARGET);
 }
 
 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
     // work area.
     gfx::Rect work_area =
         Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();
     target_bounds.SetRect(work_area.right(), work_area.bottom(), 0, 0);
   }
   target_bounds =
       ScreenAsh::ConvertRectFromScreen(window->parent(), target_bounds);
@@ skipping 465 matching lines @@
     return AnimateShowWindow(window);
   } else {
     // Don't start hiding the window again if it's already being hidden.
     return window->layer()->GetTargetOpacity() != 0.0f &&
         AnimateHideWindow(window);
   }
 }
 
 }  // namespace internal
 }  // namespace ash