Index: content/browser/indexed_db/indexed_db_metadata.h |
diff --git a/content/browser/indexed_db/indexed_db_metadata.h b/content/browser/indexed_db/indexed_db_metadata.h |
index e294868f9f1f6cc067178fa7846e5640bba7a26c..288801722f4b674bec80811303df07e41bf960e7 100644 |
--- a/content/browser/indexed_db/indexed_db_metadata.h |
+++ b/content/browser/indexed_db/indexed_db_metadata.h |
@@ -5,20 +5,21 @@ |
#ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_ |
#define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_ |
+#include <stdint.h> |
+ |
#include <map> |
-#include "base/basictypes.h" |
#include "base/strings/string16.h" |
#include "content/common/indexed_db/indexed_db_key_path.h" |
namespace content { |
struct CONTENT_EXPORT IndexedDBIndexMetadata { |
- static const int64 kInvalidId = -1; |
+ static const int64_t kInvalidId = -1; |
IndexedDBIndexMetadata(); |
IndexedDBIndexMetadata(const base::string16& name, |
- int64 id, |
+ int64_t id, |
const IndexedDBKeyPath& key_path, |
bool unique, |
bool multi_entry); |
@@ -27,33 +28,33 @@ struct CONTENT_EXPORT IndexedDBIndexMetadata { |
IndexedDBIndexMetadata& operator=(const IndexedDBIndexMetadata& other); |
base::string16 name; |
- int64 id; |
+ int64_t id; |
IndexedDBKeyPath key_path; |
bool unique; |
bool multi_entry; |
}; |
struct CONTENT_EXPORT IndexedDBObjectStoreMetadata { |
- typedef std::map<int64, IndexedDBIndexMetadata> IndexMap; |
+ typedef std::map<int64_t, IndexedDBIndexMetadata> IndexMap; |
- static const int64 kInvalidId = -1; |
+ static const int64_t kInvalidId = -1; |
IndexedDBObjectStoreMetadata(); |
IndexedDBObjectStoreMetadata(const base::string16& name, |
- int64 id, |
+ int64_t id, |
const IndexedDBKeyPath& key_path, |
bool auto_increment, |
- int64 max_index_id); |
+ int64_t max_index_id); |
IndexedDBObjectStoreMetadata(const IndexedDBObjectStoreMetadata& other); |
~IndexedDBObjectStoreMetadata(); |
IndexedDBObjectStoreMetadata& operator=( |
const IndexedDBObjectStoreMetadata& other); |
base::string16 name; |
- int64 id; |
+ int64_t id; |
IndexedDBKeyPath key_path; |
bool auto_increment; |
- int64 max_index_id; |
+ int64_t max_index_id; |
IndexMap indexes; |
}; |
@@ -65,23 +66,23 @@ struct CONTENT_EXPORT IndexedDBDatabaseMetadata { |
DEFAULT_INT_VERSION = 0 |
}; |
- typedef std::map<int64, IndexedDBObjectStoreMetadata> ObjectStoreMap; |
+ typedef std::map<int64_t, IndexedDBObjectStoreMetadata> ObjectStoreMap; |
IndexedDBDatabaseMetadata(); |
IndexedDBDatabaseMetadata(const base::string16& name, |
- int64 id, |
+ int64_t id, |
const base::string16& version, |
- int64 int_version, |
- int64 max_object_store_id); |
+ int64_t int_version, |
+ int64_t max_object_store_id); |
IndexedDBDatabaseMetadata(const IndexedDBDatabaseMetadata& other); |
~IndexedDBDatabaseMetadata(); |
IndexedDBDatabaseMetadata& operator=(IndexedDBDatabaseMetadata& other); |
base::string16 name; |
- int64 id; |
+ int64_t id; |
base::string16 version; |
- int64 int_version; |
- int64 max_object_store_id; |
+ int64_t int_version; |
+ int64_t max_object_store_id; |
ObjectStoreMap object_stores; |
}; |