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

Unified Diff: webkit/browser/dom_storage/session_storage_database.cc

Issue 16415016: Move nullable_string16.h to the string subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar Created 7 years, 6 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/browser/dom_storage/session_storage_database.cc
diff --git a/webkit/browser/dom_storage/session_storage_database.cc b/webkit/browser/dom_storage/session_storage_database.cc
index 3645c271e408aacce139d041bf2f0353fac363e9..ef187ad1260b73bc26616921356a8bf9003260ca 100644
--- a/webkit/browser/dom_storage/session_storage_database.cc
+++ b/webkit/browser/dom_storage/session_storage_database.cc
@@ -523,14 +523,15 @@ bool SessionStorageDatabase::ReadMap(const std::string& map_id,
// Key is of the form "map-<mapid>-<key>".
base::string16 key16 = UTF8ToUTF16(key.substr(map_start_key.length()));
if (only_keys) {
- (*result)[key16] = NullableString16(true);
+ (*result)[key16] = base::NullableString16(true);
} else {
// Convert the raw data stored in std::string (it->value()) to raw data
// stored in base::string16.
size_t len = it->value().size() / sizeof(char16);
const char16* data_ptr =
reinterpret_cast<const char16*>(it->value().data());
- (*result)[key16] = NullableString16(base::string16(data_ptr, len), false);
+ (*result)[key16] =
+ base::NullableString16(base::string16(data_ptr, len), false);
}
}
return true;
@@ -541,7 +542,7 @@ void SessionStorageDatabase::WriteValuesToMap(const std::string& map_id,
leveldb::WriteBatch* batch) {
for (ValuesMap::const_iterator it = values.begin(); it != values.end();
++it) {
- NullableString16 value = it->second;
+ base::NullableString16 value = it->second;
std::string key = MapKey(map_id, UTF16ToUTF8(it->first));
if (value.is_null()) {
batch->Delete(key);
« no previous file with comments | « webkit/browser/dom_storage/dom_storage_host.cc ('k') | webkit/browser/dom_storage/session_storage_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698