Moves ash/wm/common back into ash

ash/wm/common/workspace/magnetism_matcher.h

 // 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.
 
 #ifndef ASH_WM_COMMON_WORKSPACE_MAGNETISM_MATCHER_H_
 #define ASH_WM_COMMON_WORKSPACE_MAGNETISM_MATCHER_H_
 
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
 enum MagnetismEdge {
   MAGNETISM_EDGE_TOP = 1 << 0,
@@ skipping 126 matching lines @@
   SecondaryMagnetismEdge secondary_edge;
 };
 
 // MagnetismMatcher is used to test if a window should snap to another window.
 // To use MagnetismMatcher do the following:
 // . Create it with the bounds of the window being dragged.
 // . Iterate over the child windows checking if the window being dragged should
 //   attach to it using ShouldAttach().
 // . Use AreEdgesObscured() to test if no other windows can match (because all
 //   edges are completely obscured).
-class ASH_WM_COMMON_EXPORT MagnetismMatcher {
+class ASH_EXPORT MagnetismMatcher {
  public:
   static const int kMagneticDistance;
 
   // |edges| is a bitmask of MagnetismEdges to match against.
   MagnetismMatcher(const gfx::Rect& bounds, uint32_t edges);
   ~MagnetismMatcher();
 
   // Returns true if |bounds| is close enough to the initial bounds that the two
   // should be attached. If true is returned |edge| is set to indicates how the
   // two should snap together. See description of MatchedEdge for details.
@@ skipping 12 matching lines @@
   const int32_t edges_;
 
   ScopedVector<MagnetismEdgeMatcher> matchers_;
 
   DISALLOW_COPY_AND_ASSIGN(MagnetismMatcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WORKSPACE_MAGNETISM_MATCHER_H_