Move more from WmShell to Shell

ash/common/system/status_area_widget_delegate.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/system/status_area_widget_delegate.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace {
 
 constexpr int kAnimationDurationMs = 250;
@@ skipping 58 matching lines @@
     event->StopPropagation();
   else
     views::AccessiblePaneView::OnGestureEvent(event);
 }
 
 bool StatusAreaWidgetDelegate::CanActivate() const {
   // We don't want mouse clicks to activate us, but we need to allow
   // activation when the user is using the keyboard (FocusCycler).
   const FocusCycler* focus_cycler = focus_cycler_for_testing_
                                         ? focus_cycler_for_testing_
-                                        : WmShell::Get()->focus_cycler();
+                                        : Shell::Get()->focus_cycler();
   return focus_cycler->widget_activating() == GetWidget();
 }
 
 void StatusAreaWidgetDelegate::DeleteDelegate() {}
 
 void StatusAreaWidgetDelegate::AddTray(views::View* tray) {
   SetLayoutManager(NULL);  // Reset layout manager before adding a child.
   AddChildView(tray);
   // Set the layout manager with the new list of children.
   UpdateLayout();
@@ skipping 86 matching lines @@
   child->SetBorder(
       views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge));
 
   // Layout on |child| needs to be updated based on new border value before
   // displaying; otherwise |child| will be showing with old border size.
   // Fix for crbug.com/623438.
   child->Layout();
 }
 
 }  // namespace ash