Refactor: Shelf Widget

ash/wm/panels/panel_window_resizer_unittest.cc

 // Copyright (c) 2013 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/shelf_types.h"
+#include "ash/root_window_controller.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/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 class PanelWindowResizerTest : public test::AshTestBase {
  public:
   PanelWindowResizerTest() : window_(NULL) {}
   virtual ~PanelWindowResizerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     window_.reset(CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
 
     panel_layout_manager_ = static_cast<internal::PanelLayoutManager*>(
         GetPanelContainer()->layout_manager());
-    launcher_bounds_ = panel_layout_manager_->launcher()->widget()->
+    launcher_bounds_ = panel_layout_manager_->launcher()->shelf_widget()->
         GetWindowBoundsInScreen();
   }
 
   virtual void TearDown() OVERRIDE {
     window_.reset();
     AshTestBase::TearDown();
   }
 
  protected:
   gfx::Point CalculateDragPoint(const PanelWindowResizer& resizer,
@@ skipping 122 matching lines @@
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachTop) {
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_TOP, shell->GetPrimaryRootWindow());
   DetachReattachTest(0, 1);
 }
 
 }  // namespace internal
 }  // namespace ash