Switch to standard integer types in chrome/browser/, part 4 of 4.

chrome/browser/themes/browser_theme_pack.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 CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 #define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
 #include "extensions/common/extension.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/color_utils.h"
 
 namespace base {
 class DictionaryValue;
@@ skipping 67 matching lines @@
  private:
   friend class BrowserThemePackTest;
 
   // Cached images.
   typedef std::map<int, gfx::Image> ImageCache;
 
   // The raw PNG memory associated with a certain id.
   typedef std::map<int, scoped_refptr<base::RefCountedMemory> > RawImages;
 
   // The type passed to ui::DataPack::WritePack.
-  typedef std::map<uint16, base::StringPiece> RawDataForWriting;
+  typedef std::map<uint16_t, base::StringPiece> RawDataForWriting;
 
   // Maps scale factors (enum values) to file paths.
   typedef std::map<ui::ScaleFactor, base::FilePath> ScaleFactorToFileMap;
 
   // Maps image ids to maps of scale factors to file paths.
   typedef std::map<int, ScaleFactorToFileMap> FilePathMap;
 
   // Default. Everything is empty.
   BrowserThemePack();
 
@@ skipping 99 matching lines @@
 
   // Data pack, if we have one.
   scoped_ptr<ui::DataPack> data_pack_;
 
   // All structs written to disk need to be packed; no alignment tricks here,
   // please.
 #pragma pack(push,1)
   // Header that is written to disk.
   struct BrowserThemePackHeader {
     // Numeric version to make sure we're compatible in the future.
-    int32 version;
+    int32_t version;
 
     // 1 if little_endian. 0 if big_endian. On mismatch, abort load.
-    int32 little_endian;
+    int32_t little_endian;
 
     // theme_id without NULL terminator.
-    uint8 theme_id[16];
+    uint8_t theme_id[16];
   } *header_;
 
   // The remaining structs represent individual entries in an array. For the
   // following three structs, BrowserThemePack will either allocate an array or
   // will point directly to mmapped data.
   struct TintEntry {
-    int32 id;
+    int32_t id;
     double h;
     double s;
     double l;
   } *tints_;
 
   struct ColorPair {
-    int32 id;
+    int32_t id;
     SkColor color;
   } *colors_;
 
   struct DisplayPropertyPair {
-    int32 id;
-    int32 property;
+    int32_t id;
+    int32_t property;
   } *display_properties_;
 
   // A list of included source images. A pointer to a -1 terminated array of
   // our persistent IDs.
   int* source_images_;
 #pragma pack(pop)
 
   // The scale factors represented by the images in the theme pack.
   std::vector<ui::ScaleFactor> scale_factors_;
 
@@ skipping 11 matching lines @@
   // Cache of images created in BuildFromExtension(). Once the theme pack is
   // created, this cache should only be accessed on the file thread. There
   // should be no IDs in |image_memory_| that are in |images_on_file_thread_|
   // or vice versa.
   ImageCache images_on_file_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserThemePack);
 };
 
 #endif  // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_