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

Unified Diff: webkit/browser/dom_storage/dom_storage_host.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/dom_storage_host.cc
diff --git a/webkit/browser/dom_storage/dom_storage_host.cc b/webkit/browser/dom_storage/dom_storage_host.cc
index 040cf3dab513c4476540249704b09cf877b2b74e..95d4d762cbecdcf3a7a213317699f0234f9a036c 100644
--- a/webkit/browser/dom_storage/dom_storage_host.cc
+++ b/webkit/browser/dom_storage/dom_storage_host.cc
@@ -80,25 +80,26 @@ unsigned DomStorageHost::GetAreaLength(int connection_id) {
return area->Length();
}
-NullableString16 DomStorageHost::GetAreaKey(int connection_id, unsigned index) {
+base::NullableString16 DomStorageHost::GetAreaKey(int connection_id,
+ unsigned index) {
DomStorageArea* area = GetOpenArea(connection_id);
if (!area)
- return NullableString16(true);
+ return base::NullableString16(true);
return area->Key(index);
}
-NullableString16 DomStorageHost::GetAreaItem(int connection_id,
- const base::string16& key) {
+base::NullableString16 DomStorageHost::GetAreaItem(int connection_id,
+ const base::string16& key) {
DomStorageArea* area = GetOpenArea(connection_id);
if (!area)
- return NullableString16(true);
+ return base::NullableString16(true);
return area->GetItem(key);
}
bool DomStorageHost::SetAreaItem(
int connection_id, const base::string16& key,
const base::string16& value, const GURL& page_url,
- NullableString16* old_value) {
+ base::NullableString16* old_value) {
DomStorageArea* area = GetOpenArea(connection_id);
if (!area) {
// TODO(michaeln): Fix crbug/134003 and return false here.
« no previous file with comments | « webkit/browser/dom_storage/dom_storage_host.h ('k') | webkit/browser/dom_storage/session_storage_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698