Refactors WindowResizers to use 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"
-#include "ash/wm/aura/wm_window_aura.h"
+#include "ash/wm/common/shelf/wm_shelf.h"
 #include "ash/wm/common/window_parenting_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_root_window_controller.h"
+#include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/screen.h"
-#include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 const int kPanelSnapToLauncherDistance = 30;
 
 }  // namespace
 
 PanelWindowResizer::~PanelWindowResizer() {
@@ skipping 84 matching lines @@
   initial_panel_container_ = panel_container_;
 }
 
 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()
-            ->shelf_widget()
-            ->GetWindowBoundsInScreen());
-    switch (panel_layout_manager->shelf()->alignment()) {
+        panel_layout_manager->shelf()->GetWindow()->GetBoundsInScreen());
+    switch (panel_layout_manager->shelf()->GetAlignment()) {
       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 wm::SHELF_ALIGNMENT_LEFT:
         if (bounds.x() <= (launcher_bounds.right() +
@@ skipping 56 matching lines @@
   if (initial_panel_container_ != panel_container_)
     PanelLayoutManager::Get(initial_panel_container_)->FinishDragging();
   if (panel_container_)
     PanelLayoutManager::Get(panel_container_)->FinishDragging();
 }
 
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     PanelLayoutManager::Get(panel_container_)
         ->shelf()
-        ->UpdateIconPositionForWindow(
-            wm::WmWindowAura::GetAuraWindow(GetTarget()));
+        ->UpdateIconPositionForWindow(GetTarget());
   }
 }
 
 }  // namespace ash