ash: Explicitly teach various components about ShelfLayoutManager.

ash/wm/panels/panel_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/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 294 matching lines @@
   dragged_panel_ = NULL;
   Relayout();
 }
 
 void PanelLayoutManager::SetShelf(Shelf* shelf) {
   DCHECK(!shelf_);
   DCHECK(!shelf_layout_manager_);
   shelf_ = shelf;
   shelf_->AddIconObserver(this);
   if (shelf_->shelf_widget()) {
-    shelf_layout_manager_ = ash::ShelfLayoutManager::ForShelf(
-        shelf_->shelf_widget()->GetNativeWindow());
+    shelf_layout_manager_ = shelf_->shelf_widget()->shelf_layout_manager();
     WillChangeVisibilityState(shelf_layout_manager_->visibility_state());
     shelf_layout_manager_->AddObserver(this);
   }
 }
 
 void PanelLayoutManager::ToggleMinimize(aura::Window* panel) {
   DCHECK(panel->parent() == panel_container_);
   wm::WindowState* window_state = wm::GetWindowState(panel);
   if (window_state->IsMinimized())
     window_state->Restore();
@@ skipping 625 matching lines @@
       // Keyboard hidden, restore original bounds if they exist.
       SetChildBounds(panel, panel_state->GetRestoreBoundsInScreen());
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 }  // namespace ash