Rename Launcher to Shelf.

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>
 
-#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"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 470 matching lines @@
       type == LAYER_SCALE_ANIMATION_ABOVE ? kLayerScaleAboveSize :
           kLayerScaleBelowSize;
   gfx::Transform transform;
   transform.Translate(-layer->bounds().width() * (scale - 1.0f) / 2,
                       -layer->bounds().height() * (scale - 1.0f) / 2);
   transform.Scale(scale, scale);
   layer->SetTransform(transform);
 }
 
 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())
     return item_rect;
 
   // If both the icon width and height are 0, then there is no icon in the
   // launcher for |window| or the icon is hidden in the overflow menu. If the
   // launcher is auto hidden, one of the height or width will be 0 but the
   // position in the launcher and the major dimension are still reported
   // correctly and the window can be animated to the launcher item's light
   // 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());
           break;
         case SHELF_ALIGNMENT_LEFT:
           item_rect.set_x(shelf_bounds.right());
           break;
         case SHELF_ALIGNMENT_RIGHT:
           item_rect.set_x(shelf_bounds.x());
           break;
         case SHELF_ALIGNMENT_TOP:
           item_rect.set_y(shelf_bounds.bottom());
           break;
       }
       return item_rect;
     }
   }
 
-  // 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();
   return gfx::Rect(work_area.right(), work_area.bottom(), 0, 0);
 }
 
 }  // namespace ash