Refactor: Shelf Widget

ash/wm/status_area_layout_manager.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/status_area_layout_manager.h"
 
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "base/auto_reset.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusAreaLayoutManager, public:
 
-StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfLayoutManager* shelf)
+StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf)
     : in_layout_(false),
       shelf_(shelf) {
 }
 
 StatusAreaLayoutManager::~StatusAreaLayoutManager() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusAreaLayoutManager, aura::LayoutManager implementation:
 
@@ skipping 32 matching lines @@
 
   SetChildBoundsDirect(child, requested_bounds);
   LayoutStatusArea();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusAreaLayoutManager, private:
 
 void StatusAreaLayoutManager::LayoutStatusArea() {
   // Shelf layout manager may be already doing layout.
-  if (shelf_->in_layout())
+  if (shelf_->shelf_layout_manager()->in_layout())
     return;
 
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
-  shelf_->LayoutShelf();
+  shelf_->shelf_layout_manager()->LayoutShelf();
 }
 
 }  // namespace internal
 }  // namespace ash