diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/browser/indexed_db/indexed_db_metadata.h | |
parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/indexed_db/indexed_db_metadata.h')
-rw-r--r-- | content/browser/indexed_db/indexed_db_metadata.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/indexed_db/indexed_db_metadata.h b/content/browser/indexed_db/indexed_db_metadata.h index 4e8562d..00970a6 100644 --- a/content/browser/indexed_db/indexed_db_metadata.h +++ b/content/browser/indexed_db/indexed_db_metadata.h @@ -15,7 +15,7 @@ namespace content { struct IndexedDBIndexMetadata { IndexedDBIndexMetadata() {} - IndexedDBIndexMetadata(const string16& name, + IndexedDBIndexMetadata(const base::string16& name, int64 id, const IndexedDBKeyPath& key_path, bool unique, @@ -25,7 +25,7 @@ struct IndexedDBIndexMetadata { key_path(key_path), unique(unique), multi_entry(multi_entry) {} - string16 name; + base::string16 name; int64 id; IndexedDBKeyPath key_path; bool unique; @@ -36,13 +36,13 @@ struct IndexedDBIndexMetadata { struct CONTENT_EXPORT IndexedDBObjectStoreMetadata { IndexedDBObjectStoreMetadata(); - IndexedDBObjectStoreMetadata(const string16& name, + IndexedDBObjectStoreMetadata(const base::string16& name, int64 id, const IndexedDBKeyPath& key_path, bool auto_increment, int64 max_index_id); ~IndexedDBObjectStoreMetadata(); - string16 name; + base::string16 name; int64 id; IndexedDBKeyPath key_path; bool auto_increment; @@ -64,16 +64,16 @@ struct CONTENT_EXPORT IndexedDBDatabaseMetadata { typedef std::map<int64, IndexedDBObjectStoreMetadata> ObjectStoreMap; IndexedDBDatabaseMetadata(); - IndexedDBDatabaseMetadata(const string16& name, + IndexedDBDatabaseMetadata(const base::string16& name, int64 id, - const string16& version, + const base::string16& version, int64 int_version, int64 max_object_store_id); ~IndexedDBDatabaseMetadata(); - string16 name; + base::string16 name; int64 id; - string16 version; + base::string16 version; int64 int_version; int64 max_object_store_id; |