Refactor: Shelf Widget

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/launcher/launcher.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf_types.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/panels/panel_layout_manager.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 75 matching lines @@
   if (panel_container_) {
     panel_layout_manager_ = static_cast<internal::PanelLayoutManager*>(
         panel_container_->layout_manager());
   }
   ash::Shell::GetInstance()->cursor_manager()->LockCursor();
 }
 
 bool PanelWindowResizer::AttachToLauncher(gfx::Rect* bounds) {
   bool should_attach = false;
   if (panel_layout_manager_) {
-    gfx::Rect launcher_bounds = panel_layout_manager_->launcher()->widget()->
-        GetWindowBoundsInScreen();
+    gfx::Rect launcher_bounds = panel_layout_manager_->launcher()->
+        shelf_widget()->GetWindowBoundsInScreen();
     switch (panel_layout_manager_->launcher()->alignment()) {
       case SHELF_ALIGNMENT_BOTTOM:
         if (bounds->bottom() >= (launcher_bounds.y() -
                                  kPanelSnapToLauncherDistance)) {
           should_attach = true;
           bounds->set_y(launcher_bounds.y() - bounds->height());
         }
         break;
       case SHELF_ALIGNMENT_LEFT:
         if (bounds->x() <= (launcher_bounds.right() +
@@ skipping 25 matching lines @@
   if (was_attached_)
     panel_layout_manager_->StartDragging(details_.window);
 }
 
 void PanelWindowResizer::FinishDragging() {
   if (was_attached_)
     panel_layout_manager_->FinishDragging();
 }
 
 }  // namespace aura