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

Unified Diff: content/common/indexed_db/indexed_db_key_path.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
« no previous file with comments | « content/common/indexed_db/indexed_db_key.cc ('k') | content/common/indexed_db/indexed_db_key_path.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/indexed_db/indexed_db_key_path.h
diff --git a/content/common/indexed_db/indexed_db_key_path.h b/content/common/indexed_db/indexed_db_key_path.h
index a17c193bd2004c740554a464fe657b194f0333ad..ec5e8611b235dc579321b8326e854b925ddfe32f 100644
--- a/content/common/indexed_db/indexed_db_key_path.h
+++ b/content/common/indexed_db/indexed_db_key_path.h
@@ -17,21 +17,21 @@ namespace content {
class CONTENT_EXPORT IndexedDBKeyPath {
public:
IndexedDBKeyPath(); // Defaults to blink::WebIDBKeyPathTypeNull.
- explicit IndexedDBKeyPath(const string16&);
- explicit IndexedDBKeyPath(const std::vector<string16>&);
+ explicit IndexedDBKeyPath(const base::string16&);
+ explicit IndexedDBKeyPath(const std::vector<base::string16>&);
~IndexedDBKeyPath();
bool IsNull() const { return type_ == blink::WebIDBKeyPathTypeNull; }
bool operator==(const IndexedDBKeyPath& other) const;
blink::WebIDBKeyPathType type() const { return type_; }
- const std::vector<string16>& array() const;
- const string16& string() const;
+ const std::vector<base::string16>& array() const;
+ const base::string16& string() const;
private:
blink::WebIDBKeyPathType type_;
- string16 string_;
- std::vector<string16> array_;
+ base::string16 string_;
+ std::vector<base::string16> array_;
};
} // namespace content
« no previous file with comments | « content/common/indexed_db/indexed_db_key.cc ('k') | content/common/indexed_db/indexed_db_key_path.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698