Rename Launcher to Shelf.

ash/wm/window_animations.cc

Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 894e11b0186e94ce29258e43ae0fcbf0b8871d55..71d73f353c6f987d38246090a470a38b9b5a6b19 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -9,8 +9,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ -501,11 +501,11 @@ void SetTransformForScaleAnimation(ui::Layer* layer,
 }
 
 gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
-  Launcher* launcher = Launcher::ForWindow(window);
+  Shelf* shelf = Shelf::ForWindow(window);
   // Shelf is created lazily and can be NULL.
-  if (!launcher)
+  if (!shelf)
     return gfx::Rect();
-  gfx::Rect item_rect = launcher->GetScreenBoundsOfItemIconForWindow(window);
+  gfx::Rect item_rect = shelf->GetScreenBoundsOfItemIconForWindow(window);
 
   // The launcher item is visible and has an icon.
   if (!item_rect.IsEmpty())
@@ -519,10 +519,9 @@ gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
   // bar.
   if (item_rect.width() != 0 || item_rect.height() != 0) {
     internal::ShelfLayoutManager* layout_manager =
-        internal::ShelfLayoutManager::ForLauncher(window);
+        internal::ShelfLayoutManager::ForShelf(window);
     if (layout_manager->visibility_state() == SHELF_AUTO_HIDE) {
-      gfx::Rect shelf_bounds =
-          launcher->shelf_widget()->GetWindowBoundsInScreen();
+      gfx::Rect shelf_bounds = shelf->shelf_widget()->GetWindowBoundsInScreen();
       switch (layout_manager->GetAlignment()) {
         case SHELF_ALIGNMENT_BOTTOM:
           item_rect.set_y(shelf_bounds.y());
@@ -541,7 +540,7 @@ gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
     }
   }
 
-  // Assume the launcher is overflowed, zoom off to the bottom right of the
+  // Assume the shelf is overflowed, zoom off to the bottom right of the
   // work area.
   gfx::Rect work_area =
       Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();