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

ash/common/wm/panels/panel_window_resizer.cc

Index: ash/common/wm/panels/panel_window_resizer.cc
diff --git a/ash/common/wm/panels/panel_window_resizer.cc b/ash/common/wm/panels/panel_window_resizer.cc
index 15f6b92ca04986e1b619b043bc87fbab4d9a0dcd..9fc3ca355cb14e481b44e4c6d02d9c19eca640ad 100644
--- a/ash/common/wm/panels/panel_window_resizer.cc
+++ b/ash/common/wm/panels/panel_window_resizer.cc
@@ -4,9 +4,9 @@
 
 #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_lookup.h"
@@ -122,22 +122,22 @@ bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
     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;