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

Unified Diff: webkit/dom_storage/dom_storage_map.cc

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months 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: webkit/dom_storage/dom_storage_map.cc
diff --git a/webkit/dom_storage/dom_storage_map.cc b/webkit/dom_storage/dom_storage_map.cc
index 6c086b644839d071fa6b21fc43c13205a165ecc2..fa8eb0945b54c093f68046a3b9e687095afa6b1b 100644
--- a/webkit/dom_storage/dom_storage_map.cc
+++ b/webkit/dom_storage/dom_storage_map.cc
@@ -8,7 +8,7 @@
namespace {
-size_t size_of_item(const string16& key, const string16& value) {
+size_t size_of_item(const base::string16& key, const base::string16& value) {
return (key.length() + value.length()) * sizeof(char16);
}
@@ -54,7 +54,7 @@ NullableString16 DomStorageMap::Key(unsigned index) {
return NullableString16(key_iterator_->first, false);
}
-NullableString16 DomStorageMap::GetItem(const string16& key) const {
+NullableString16 DomStorageMap::GetItem(const base::string16& key) const {
ValuesMap::const_iterator found = values_.find(key);
if (found == values_.end())
return NullableString16(true);
@@ -62,7 +62,7 @@ NullableString16 DomStorageMap::GetItem(const string16& key) const {
}
bool DomStorageMap::SetItem(
- const string16& key, const string16& value,
+ const base::string16& key, const base::string16& value,
NullableString16* old_value) {
ValuesMap::const_iterator found = values_.find(key);
if (found == values_.end())
@@ -87,8 +87,8 @@ bool DomStorageMap::SetItem(
}
bool DomStorageMap::RemoveItem(
- const string16& key,
- string16* old_value) {
+ const base::string16& key,
+ base::string16* old_value) {
ValuesMap::iterator found = values_.find(key);
if (found == values_.end())
return false;

Powered by Google App Engine
This is Rietveld 408576698