mash: Convert FocusCycler to wm common types and move to //ash/common

ash/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/system/status_area_widget_delegate.h"
 
 #include "ash/ash_export.h"
 #include "ash/ash_switches.h"
+#include "ash/common/focus_cycler.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/tray_constants.h"
-#include "ash/focus_cycler.h"
-#include "ash/shelf/shelf_util.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 58 matching lines @@
                                     ->GetNativeWindow();
   if (gesture_handler_.ProcessGestureEvent(*event, target_window))
     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_ : Shell::GetInstance()->focus_cycler();
+  const FocusCycler* focus_cycler = focus_cycler_for_testing_
+                                        ? focus_cycler_for_testing_
+                                        : WmShell::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.
@@ skipping 129 matching lines @@
           on_edge ? GetTrayConstant(TRAY_PADDING_FROM_EDGE_OF_SHELF) : 0;
       right_edge =
           GetShelfConstant(SHELF_SIZE) - kShelfItemInset - kShelfItemHeight;
     }
   }
   child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge,
                                                     bottom_edge, right_edge));
 }
 
 }  // namespace ash