diff options
| author | avi <avi@chromium.org> | 2015-12-25 17:09:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 01:10:32 +0000 |
| commit | 6846aeff59836d8064ad90a934c60829575a970e (patch) | |
| tree | 81582da159992a636983c3346fc291e5cb6151cb /chrome/browser/media_galleries/media_galleries_preferences.h | |
| parent | e4d7b6ff9e03d4d0ee39e270bd1ad5ddf0d6af5a (diff) | |
| download | chromium_src-6846aeff59836d8064ad90a934c60829575a970e.zip chromium_src-6846aeff59836d8064ad90a934c60829575a970e.tar.gz chromium_src-6846aeff59836d8064ad90a934c60829575a970e.tar.bz2 | |
Switch to standard integer types in chrome/browser/, part 2 of 4.
BUG=138542
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1550593002
Cr-Commit-Position: refs/heads/master@{#366879}
Diffstat (limited to 'chrome/browser/media_galleries/media_galleries_preferences.h')
| -rw-r--r-- | chrome/browser/media_galleries/media_galleries_preferences.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.h b/chrome/browser/media_galleries/media_galleries_preferences.h index c60c75a..000bebd 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.h +++ b/chrome/browser/media_galleries/media_galleries_preferences.h @@ -5,14 +5,16 @@ #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_ #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_ +#include <stdint.h> + #include <map> #include <set> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/strings/string16.h" @@ -35,7 +37,7 @@ namespace user_prefs { class PrefRegistrySyncable; } -typedef uint64 MediaGalleryPrefId; +typedef uint64_t MediaGalleryPrefId; const MediaGalleryPrefId kInvalidMediaGalleryPrefId = 0; const char kMediaGalleriesPrefsVersionKey[] = "preferencesVersion"; @@ -103,7 +105,7 @@ struct MediaGalleryPrefInfo { // The capacity in bytes of the volume/device on which the gallery is // located. Will be zero if unknown. - uint64 total_size_in_bytes; + uint64_t total_size_in_bytes; // If the gallery is on a removable device, the time that device was last // attached. It is stored in preferences by the base::Time internal value, @@ -233,7 +235,7 @@ class MediaGalleriesPreferences const base::string16& volume_label, const base::string16& vendor_name, const base::string16& model_name, - uint64 total_size_in_bytes, + uint64_t total_size_in_bytes, base::Time last_attach_time, int audio_count, int image_count, @@ -330,7 +332,7 @@ class MediaGalleriesPreferences const base::string16& volume_label, const base::string16& vendor_name, const base::string16& model_name, - uint64 total_size_in_bytes, + uint64_t total_size_in_bytes, base::Time last_attach_time, bool volume_metadata_valid, int audio_count, |