Moves ash/wm/common back into ash

ash/wm/common/workspace/two_step_edge_cycler.h

 // Copyright 2014 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.
 
 #ifndef ASH_WM_COMMON_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
 #define ASH_WM_COMMON_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace ash {
 
 // TwoStepEdgeCycler is responsible for cycling between two modes when the mouse
 // is at the edge of the workspace. The cycler does not loop so it is impossible
 // to get back to the first mode once the second mode is reached.
 // TwoStepEdgeCycler should be destroyed once the mouse moves off the edge of
 // the workspace.
-class ASH_WM_COMMON_EXPORT TwoStepEdgeCycler {
+class ASH_EXPORT TwoStepEdgeCycler {
  public:
   // The direction in which a mouse should travel to switch mode.
   enum Direction { DIRECTION_LEFT, DIRECTION_RIGHT };
 
   explicit TwoStepEdgeCycler(const gfx::Point& start, Direction direction);
   ~TwoStepEdgeCycler();
 
   // Update which mode should be used as a result of a mouse / touch move.
   // |location| is the location of the event.
   void OnMove(const gfx::Point& location);
@@ skipping 21 matching lines @@
 
   // Determines a preferred movement direction that we are watching.
   Direction direction_;
 
   DISALLOW_COPY_AND_ASSIGN(TwoStepEdgeCycler);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_