summaryrefslogtreecommitdiffstats
path: root/content/browser/indexed_db/indexed_db_metadata.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
commitfcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch)
treed41b14e6526a822b66d692f60dc8f648a2afb3cd /content/browser/indexed_db/indexed_db_metadata.cc
parent426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff)
downloadchromium_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.cc')
-rw-r--r--content/browser/indexed_db/indexed_db_metadata.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/content/browser/indexed_db/indexed_db_metadata.cc b/content/browser/indexed_db/indexed_db_metadata.cc
index 80d3142..47b7219 100644
--- a/content/browser/indexed_db/indexed_db_metadata.cc
+++ b/content/browser/indexed_db/indexed_db_metadata.cc
@@ -7,7 +7,7 @@
namespace content {
IndexedDBObjectStoreMetadata::IndexedDBObjectStoreMetadata(
- const string16& name,
+ const base::string16& name,
int64 id,
const IndexedDBKeyPath& key_path,
bool auto_increment,
@@ -23,11 +23,12 @@ IndexedDBObjectStoreMetadata::~IndexedDBObjectStoreMetadata() {}
IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata()
: int_version(NO_INT_VERSION) {}
-IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata(const string16& name,
- int64 id,
- const string16& version,
- int64 int_version,
- int64 max_object_store_id)
+IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata(
+ const base::string16& name,
+ int64 id,
+ const base::string16& version,
+ int64 int_version,
+ int64 max_object_store_id)
: name(name),
id(id),
version(version),