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

Unified Diff: content/common/indexed_db/indexed_db_key_path.cc

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/common/indexed_db/indexed_db_key_path.cc
diff --git a/content/common/indexed_db/indexed_db_key_path.cc b/content/common/indexed_db/indexed_db_key_path.cc
index b01de7340d60961efc9c2c8c9bb127ed5d647174..3783d4281a8fc7090e3a9645fc99e24dc10036cc 100644
--- a/content/common/indexed_db/indexed_db_key_path.cc
+++ b/content/common/indexed_db/indexed_db_key_path.cc
@@ -14,20 +14,20 @@ using blink::WebIDBKeyPathTypeString;
IndexedDBKeyPath::IndexedDBKeyPath() : type_(WebIDBKeyPathTypeNull) {}
-IndexedDBKeyPath::IndexedDBKeyPath(const string16& string)
+IndexedDBKeyPath::IndexedDBKeyPath(const base::string16& string)
: type_(WebIDBKeyPathTypeString), string_(string) {}
-IndexedDBKeyPath::IndexedDBKeyPath(const std::vector<string16>& array)
+IndexedDBKeyPath::IndexedDBKeyPath(const std::vector<base::string16>& array)
: type_(WebIDBKeyPathTypeArray), array_(array) {}
IndexedDBKeyPath::~IndexedDBKeyPath() {}
-const std::vector<string16>& IndexedDBKeyPath::array() const {
+const std::vector<base::string16>& IndexedDBKeyPath::array() const {
DCHECK(type_ == blink::WebIDBKeyPathTypeArray);
return array_;
}
-const string16& IndexedDBKeyPath::string() const {
+const base::string16& IndexedDBKeyPath::string() const {
DCHECK(type_ == blink::WebIDBKeyPathTypeString);
return string_;
}
« no previous file with comments | « content/common/indexed_db/indexed_db_key_path.h ('k') | content/common/indexed_db/indexed_db_key_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698