mash: Move ash/common/wm/shelf to ash/common/shelf

ash/common/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/common/wm/panels/panel_window_resizer.h"
 
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
-#include "ash/common/wm/shelf/wm_shelf.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_lookup.h"
 #include "ash/common/wm/wm_root_window_controller.h"
 #include "ash/common/wm/wm_window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
@@ skipping 95 matching lines @@
 
 bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
                                           gfx::Point* offset) {
   bool should_attach = false;
   if (panel_container_) {
     PanelLayoutManager* panel_layout_manager =
         PanelLayoutManager::Get(panel_container_);
     gfx::Rect launcher_bounds = GetTarget()->GetParent()->ConvertRectFromScreen(
         panel_layout_manager->shelf()->GetWindow()->GetBoundsInScreen());
     switch (panel_layout_manager->shelf()->GetAlignment()) {
-      case wm::SHELF_ALIGNMENT_BOTTOM:
-      case wm::SHELF_ALIGNMENT_BOTTOM_LOCKED:
+      case SHELF_ALIGNMENT_BOTTOM:
+      case SHELF_ALIGNMENT_BOTTOM_LOCKED:
         if (bounds.bottom() >=
             (launcher_bounds.y() - kPanelSnapToLauncherDistance)) {
           should_attach = true;
           offset->set_y(launcher_bounds.y() - bounds.height() - bounds.y());
         }
         break;
-      case wm::SHELF_ALIGNMENT_LEFT:
+      case SHELF_ALIGNMENT_LEFT:
         if (bounds.x() <=
             (launcher_bounds.right() + kPanelSnapToLauncherDistance)) {
           should_attach = true;
           offset->set_x(launcher_bounds.right() - bounds.x());
         }
         break;
-      case wm::SHELF_ALIGNMENT_RIGHT:
+      case SHELF_ALIGNMENT_RIGHT:
         if (bounds.right() >=
             (launcher_bounds.x() - kPanelSnapToLauncherDistance)) {
           should_attach = true;
           offset->set_x(launcher_bounds.x() - bounds.width() - bounds.x());
         }
         break;
     }
   }
   return should_attach;
 }
@@ skipping 45 matching lines @@
 
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     PanelLayoutManager::Get(panel_container_)
         ->shelf()
         ->UpdateIconPositionForWindow(GetTarget());
   }
 }
 
 }  // namespace ash