Switch to standard integer types in ash/.

ash/wm/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_WORKSPACE_MAGNETISM_MATCHER_H_
 #define ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
 
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
 #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,
   MAGNETISM_EDGE_LEFT   = 1 << 1,
   MAGNETISM_EDGE_BOTTOM = 1 << 2,
   MAGNETISM_EDGE_RIGHT  = 1 << 3,
 };
 
-const uint32 kAllMagnetismEdges =
-    MAGNETISM_EDGE_TOP | MAGNETISM_EDGE_LEFT | MAGNETISM_EDGE_BOTTOM |
-    MAGNETISM_EDGE_RIGHT;
+const uint32_t kAllMagnetismEdges = MAGNETISM_EDGE_TOP | MAGNETISM_EDGE_LEFT |
+                                    MAGNETISM_EDGE_BOTTOM |
+                                    MAGNETISM_EDGE_RIGHT;
 
 // MagnetismEdgeMatcher is used for matching a particular edge of a window. You
 // shouldn't need to use this directly, instead use MagnetismMatcher which takes
 // care of all edges.
 // MagnetismEdgeMatcher maintains a range of the visible portions of the
 // edge. As ShouldAttach() is invoked the visible range is updated.
 class MagnetismEdgeMatcher {
  public:
   MagnetismEdgeMatcher(const gfx::Rect& bounds, MagnetismEdge edge);
   ~MagnetismEdgeMatcher();
@@ skipping 113 matching lines @@
 // . 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_EXPORT MagnetismMatcher {
  public:
   static const int kMagneticDistance;
 
   // |edges| is a bitmask of MagnetismEdges to match against.
-  MagnetismMatcher(const gfx::Rect& bounds, uint32 edges);
+  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.
   bool ShouldAttach(const gfx::Rect& bounds, MatchedEdge* edge);
 
   // Returns true if no other matches are possible.
   bool AreEdgesObscured() const;
 
  private:
   // Sets |secondary_edge| based on whether the secondary edges should snap.
   void AttachToSecondaryEdge(const gfx::Rect& bounds,
                              MagnetismEdge edge,
                              SecondaryMagnetismEdge* secondary_edge) const;
 
   // The edges to match against.
-  const int32 edges_;
+  const int32_t edges_;
 
   ScopedVector<MagnetismEdgeMatcher> matchers_;
 
   DISALLOW_COPY_AND_ASSIGN(MagnetismMatcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_