Switch to standard integer types in ui/gfx/.

ui/gfx/sequential_id_generator.h

Index: ui/gfx/sequential_id_generator.h
diff --git a/ui/gfx/sequential_id_generator.h b/ui/gfx/sequential_id_generator.h
index bde2f585bea0f8725d1cfa040d364309d4275d54..53c36859cd4f65a546026f50a5f30451f9fba1f6 100644
--- a/ui/gfx/sequential_id_generator.h
+++ b/ui/gfx/sequential_id_generator.h
@@ -5,10 +5,12 @@
 #ifndef UI_GFX_SEQUENTIAL_ID_GENERATOR_H_
 #define UI_GFX_SEQUENTIAL_ID_GENERATOR_H_
 
+#include <stdint.h>
+
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace ui {
@@ -18,41 +20,41 @@ namespace ui {
 class GFX_EXPORT SequentialIDGenerator {
  public:
    // Creates a new generator with the specified lower bound for the IDs.
-  explicit SequentialIDGenerator(uint32 min_id);
+  explicit SequentialIDGenerator(uint32_t min_id);
   ~SequentialIDGenerator();
 
   // Generates a unique ID to represent |number|. The generated ID is the
   // smallest available ID greater than or equal to the |min_id| specified
   // during creation of the generator.
-  uint32 GetGeneratedID(uint32 number);
+  uint32_t GetGeneratedID(uint32_t number);
 
   // Checks to see if the generator currently has a unique ID generated for
   // |number|.
-  bool HasGeneratedIDFor(uint32 number) const;
+  bool HasGeneratedIDFor(uint32_t number) const;
 
   // Removes the generated ID |id| from the internal mapping. Since the ID is
   // no longer mapped to any number, subsequent calls to |GetGeneratedID()| can
   // use this ID.
-  void ReleaseGeneratedID(uint32 id);
+  void ReleaseGeneratedID(uint32_t id);
 
   // Removes the ID previously generated for |number| by calling
   // |GetGeneratedID()|.
-  void ReleaseNumber(uint32 number);
+  void ReleaseNumber(uint32_t number);
 
   void ResetForTest();
 
  private:
-  typedef base::hash_map<uint32, uint32> IDMap;
+  typedef base::hash_map<uint32_t, uint32_t> IDMap;
 
-  uint32 GetNextAvailableID();
+  uint32_t GetNextAvailableID();
 
-  void UpdateNextAvailableIDAfterRelease(uint32 id);
+  void UpdateNextAvailableIDAfterRelease(uint32_t id);
 
   IDMap number_to_id_;
   IDMap id_to_number_;
 
-  const uint32 min_id_;
-  uint32 min_available_id_;
+  const uint32_t min_id_;
+  uint32_t min_available_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SequentialIDGenerator);
 };