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

Unified Diff: webkit/dom_storage/dom_storage_host.h

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_host.h
diff --git a/webkit/dom_storage/dom_storage_host.h b/webkit/dom_storage/dom_storage_host.h
index 54a18a41bdeb68fcfebdac973af554a86d77f054..46e3c69957042de474864637724bd66362202f40 100644
--- a/webkit/dom_storage/dom_storage_host.h
+++ b/webkit/dom_storage/dom_storage_host.h
@@ -8,8 +8,8 @@
#include <map>
#include "base/memory/ref_counted.h"
-#include "base/nullable_string16.h"
-#include "base/string16.h"
+#include "base/nullable_base::string16.h"
+#include "base/string16.h.h"
#include "webkit/dom_storage/dom_storage_types.h"
#include "webkit/storage/webkit_storage_export.h"
@@ -38,13 +38,13 @@ class WEBKIT_STORAGE_EXPORT DomStorageHost {
bool ExtractAreaValues(int connection_id, ValuesMap* map);
unsigned GetAreaLength(int connection_id);
NullableString16 GetAreaKey(int connection_id, unsigned index);
- NullableString16 GetAreaItem(int connection_id, const string16& key);
- bool SetAreaItem(int connection_id, const string16& key,
- const string16& value, const GURL& page_url,
+ NullableString16 GetAreaItem(int connection_id, const base::string16& key);
+ bool SetAreaItem(int connection_id, const base::string16& key,
+ const base::string16& value, const GURL& page_url,
NullableString16* old_value);
- bool RemoveAreaItem(int connection_id, const string16& key,
+ bool RemoveAreaItem(int connection_id, const base::string16& key,
const GURL& page_url,
- string16* old_value);
+ base::string16* old_value);
bool ClearArea(int connection_id, const GURL& page_url);
bool HasAreaOpen(int namespace_id, const GURL& origin) const;

Powered by Google App Engine
This is Rietveld 408576698