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

Unified Diff: content/renderer/dom_storage/local_storage_cached_area.cc

Issue 2600383002: Use explicit WebString <-> string16 conversion methods in storage API files (2) (Closed)
Patch Set: Created 4 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/renderer/dom_storage/local_storage_cached_area.cc
diff --git a/content/renderer/dom_storage/local_storage_cached_area.cc b/content/renderer/dom_storage/local_storage_cached_area.cc
index 379394c4f2a39dc079d7021717e26460668c4cba..f258064a8f1b88703b8dbcd489ed0f3f6e88f6c8 100644
--- a/content/renderer/dom_storage/local_storage_cached_area.cc
+++ b/content/renderer/dom_storage/local_storage_cached_area.cc
@@ -207,8 +207,9 @@ void LocalStorageCachedArea::KeyDeleted(const std::vector<uint8_t>& key,
}
blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
- key_string, Uint8VectorToString16(old_value), base::NullableString16(),
- origin_.GetURL(), page_url, originating_area);
+ blink::WebString::fromUTF16(key_string),
+ blink::WebString::fromUTF16(Uint8VectorToString16(old_value)),
+ blink::WebString(), origin_.GetURL(), page_url, originating_area);
}
void LocalStorageCachedArea::AllDeleted(const std::string& source) {
@@ -238,8 +239,8 @@ void LocalStorageCachedArea::AllDeleted(const std::string& source) {
}
blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
- base::NullableString16(), base::NullableString16(),
- base::NullableString16(), origin_.GetURL(), page_url, originating_area);
+ blink::WebString(), blink::WebString(), blink::WebString(),
+ origin_.GetURL(), page_url, originating_area);
}
void LocalStorageCachedArea::KeyAddedOrChanged(
@@ -274,7 +275,9 @@ void LocalStorageCachedArea::KeyAddedOrChanged(
}
blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
- key_string, old_value, new_value_string, origin_.GetURL(), page_url,
+ blink::WebString::fromUTF16(key_string),
+ blink::WebString::fromUTF16(old_value),
+ blink::WebString::fromUTF16(new_value_string), origin_.GetURL(), page_url,
originating_area);
}

Powered by Google App Engine
This is Rietveld 408576698