Rename Launcher to Shelf.

ash/wm/panels/panel_window_resizer.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/panels/panel_window_resizer.h"
 
 #include "ash/display/display_controller.h"
-#include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 122 matching lines @@
 }
 
 bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
                                           gfx::Point* offset) {
   bool should_attach = false;
   if (panel_container_) {
     internal::PanelLayoutManager* panel_layout_manager =
         GetPanelLayoutManager(panel_container_);
     gfx::Rect launcher_bounds = ScreenAsh::ConvertRectFromScreen(
         GetTarget()->parent(),
-        panel_layout_manager->launcher()->
+        panel_layout_manager->shelf()->
         shelf_widget()->GetWindowBoundsInScreen());
-    switch (panel_layout_manager->launcher()->alignment()) {
+    switch (panel_layout_manager->shelf()->alignment()) {
       case SHELF_ALIGNMENT_BOTTOM:
         if (bounds.bottom() >= (launcher_bounds.y() -
                                 kPanelSnapToLauncherDistance)) {
           should_attach = true;
           offset->set_y(launcher_bounds.y() - bounds.height() - bounds.y());
         }
         break;
       case SHELF_ALIGNMENT_LEFT:
         if (bounds.x() <= (launcher_bounds.right() +
                            kPanelSnapToLauncherDistance)) {
@@ skipping 61 matching lines @@
   // but then canceled the drag we may need to inform the original layout
   // manager that the drag is finished.
   if (initial_panel_container_ != panel_container_)
      GetPanelLayoutManager(initial_panel_container_)->FinishDragging();
   if (panel_container_)
     GetPanelLayoutManager(panel_container_)->FinishDragging();
 }
 
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
-    GetPanelLayoutManager(panel_container_)->launcher()->
+    GetPanelLayoutManager(panel_container_)->shelf()->
         UpdateIconPositionForWindow(GetTarget());
   }
 }
 
 }  // namespace aura