Promotes more accessors from WmShell to Shell

ash/common/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/common/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 240 matching lines @@
       root_window_controller_(panel_container->GetRootWindowController()),
       in_add_window_(false),
       in_layout_(false),
       show_callout_widgets_(true),
       dragged_panel_(nullptr),
       shelf_(nullptr),
       last_active_panel_(nullptr),
       keyboard_observer_(this),
       weak_factory_(this) {
   DCHECK(panel_container);
-  WmShell* shell = panel_container->GetShell();
   Shell::GetInstance()->activation_client()->AddObserver(this);
-  shell->AddDisplayObserver(this);
+  WmShell::Get()->AddDisplayObserver(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 PanelLayoutManager::~PanelLayoutManager() {
   Shutdown();
 }
 
 // static
 PanelLayoutManager* PanelLayoutManager::Get(WmWindow* window) {
   if (!window)
@@ skipping 335 matching lines @@
 
 void PanelLayoutManager::Relayout() {
   if (!shelf_ || !shelf_->GetWindow())
     return;
 
   // Suppress layouts during overview mode because changing window bounds
   // interfered with overview mode animations. However, layouts need to be done
   // when the WindowSelectorController is restoring minimized windows so that
   // they actually become visible.
   WindowSelectorController* window_selector_controller =
-      WmShell::Get()->window_selector_controller();
+      Shell::Get()->window_selector_controller();
   if (in_layout_ ||
       (window_selector_controller->IsSelecting() &&
        !window_selector_controller->IsRestoringMinimizedWindows())) {
     return;
   }
 
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
   const ShelfAlignment alignment = shelf_->GetAlignment();
   const bool horizontal = shelf_->IsHorizontalAlignment();
@@ skipping 313 matching lines @@
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {
   keyboard_observer_.RemoveAll();
 }
 
 }  // namespace ash