Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Unified Diff: content/browser/indexed_db/indexed_db_metadata.h

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4e8562d1f68603b3e70f16fb640009658e297105..00970a61ee51d54540b6351e3d029391439c6c40 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;
« no previous file with comments | « content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc ('k') | content/browser/indexed_db/indexed_db_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698