Refactors DockedWindowLayoutManager in terms of ash/wm/common

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/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_window_ids.h"
@@ skipping 108 matching lines @@
                                           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()
             ->shelf_widget()
             ->GetWindowBoundsInScreen());
     switch (panel_layout_manager->shelf()->alignment()) {
-      case SHELF_ALIGNMENT_BOTTOM:
-      case SHELF_ALIGNMENT_BOTTOM_LOCKED:
+      case wm::SHELF_ALIGNMENT_BOTTOM:
+      case wm::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 SHELF_ALIGNMENT_LEFT:
+      case wm::SHELF_ALIGNMENT_LEFT:
         if (bounds.x() <= (launcher_bounds.right() +
                            kPanelSnapToLauncherDistance)) {
           should_attach = true;
           offset->set_x(launcher_bounds.right() - bounds.x());
         }
         break;
-      case SHELF_ALIGNMENT_RIGHT:
+      case wm::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 46 matching lines @@
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     PanelLayoutManager::Get(panel_container_)
         ->shelf()
         ->UpdateIconPositionForWindow(
             wm::WmWindowAura::GetAuraWindow(GetTarget()));
   }
 }
 
 }  // namespace ash