Switch to standard integer types in chrome/.

chrome/installer/util/shell_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.
 //
 // This file declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 
 #include <windows.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "chrome/installer/util/work_item_list.h"
 
 class BrowserDistribution;
 class RegistryEntry;
 
 namespace base {
 class CancellationFlag;
@@ skipping 171 matching lines @@
     base::FilePath icon;
     int icon_index;
     base::string16 app_id;
     base::string16 shortcut_name;
     bool dual_mode;
     bool pin_to_taskbar;
     // Bitfield made of IndividualProperties. Properties set in |options| will
     // be used to create/update the shortcut, others will be ignored on update
     // and possibly replaced by default values on create (see individual
     // property setters above for details on default values).
-    uint32 options;
+    uint32_t options;
   };
 
   // Relative path of the URL Protocol registry entry (prefixed with '\').
   static const wchar_t* kRegURLProtocol;
 
   // Relative path of DefaultIcon registry entry (prefixed with '\').
   static const wchar_t* kRegDefaultIcon;
 
   // Relative path of "shell" registry key.
   static const wchar_t* kRegShellPath;
@@ skipping 385 matching lines @@
   // Returns true unless the OS call to retrieve the username fails.
   // NOTE: Only the installer should use this suffix directly. Other callers
   // should call GetCurrentInstallationSuffix().
   static bool GetOldUserSpecificRegistrySuffix(base::string16* suffix);
 
   // Returns the base32 encoding (using the [A-Z2-7] alphabet) of |bytes|.
   // |size| is the length of |bytes|.
   // Note: This method does not suffix the output with '=' signs as technically
   // required by the base32 standard for inputs that aren't a multiple of 5
   // bytes.
-  static base::string16 ByteArrayToBase32(const uint8* bytes, size_t size);
+  static base::string16 ByteArrayToBase32(const uint8_t* bytes, size_t size);
 
   // Associates a set of file extensions with a particular application in the
   // Windows registry, for the current user only. If an extension has no
   // existing default association, the given application becomes the default.
   // Otherwise, the application is added to the Open With menu for this type,
   // but does not become the default.
   //
   // |prog_id| is the ProgId used by Windows for file associations with this
   // application. Must not be empty or start with a '.'.
   // |command_line| is the command to execute when opening a file via this
@@ skipping 24 matching lines @@
   // Set/CreateRegWorkItems and runs them using WorkItemList.
   static bool AddRegistryEntries(HKEY root,
                                  const ScopedVector<RegistryEntry>& entries);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_