Switch to standard integer types in ui/gfx/.

ui/gfx/icon_util.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 UI_GFX_ICON_UTIL_H_
 #define UI_GFX_ICON_UTIL_H_
 
 #include <windows.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace base {
 class FilePath;
 }
 
@@ skipping 174 matching lines @@
     BITMAPINFOHEADER icHeader;
     RGBQUAD icColors[1];
     BYTE icXOR[1];
     BYTE icAND[1];
   };
 #pragma pack(pop)
 
   friend class IconUtilTest;
 
   // Returns true if any pixel in the given pixels buffer has an non-zero alpha.
-  static bool PixelsHaveAlpha(const uint32* pixels, size_t num_pixels);
+  static bool PixelsHaveAlpha(const uint32_t* pixels, size_t num_pixels);
 
   // A helper function that initializes a BITMAPV5HEADER structure with a set
   // of values.
   static void InitializeBitmapHeader(BITMAPV5HEADER* header, int width,
                                      int height);
 
   // Given a single SkBitmap object and pointers to the corresponding icon
   // structures within the icon data buffer, this function sets the image
   // information (dimensions, color depth, etc.) in the icon structures and
   // also copies the underlying icon image into the appropriate location.
@@ skipping 45 matching lines @@
   // A helper function of CreateSkBitmapFromHICON.
   static SkBitmap CreateSkBitmapFromHICONHelper(HICON icon,
                                                 const gfx::Size& s);
 
   // Prevent clients from instantiating objects of that class by declaring the
   // ctor/dtor as private.
   DISALLOW_IMPLICIT_CONSTRUCTORS(IconUtil);
 };
 
 #endif  // UI_GFX_ICON_UTIL_H_