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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/webpreferences.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
« webkit/dom_storage/dom_storage_area.h ('K') | « webkit/glue/webmenuitem.h ('k') | webkit/glue/webpreferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webpreferences.h
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index f67281d0007d7ee1d2e55e8cfc06bd42097d1167..4818cc78df80e470a837648edf3bf92d797a57fb 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#include "base/string16.h"
+#include "base/string16.h.h"
#include "googleurl/src/gurl.h"
#include "webkit/glue/webkit_glue_export.h"
@@ -28,7 +28,7 @@ namespace webkit_glue {
struct WEBKIT_GLUE_EXPORT WebPreferences {
// Map of ISO 15924 four-letter script code to font family. For example,
// "Arab" to "My Arabic Font".
- typedef std::map<std::string, string16> ScriptFontFamilyMap;
+ typedef std::map<std::string, base::string16> ScriptFontFamilyMap;
enum EditingBehavior {
EDITING_BEHAVIOR_MAC,
« webkit/dom_storage/dom_storage_area.h ('K') | « webkit/glue/webmenuitem.h ('k') | webkit/glue/webpreferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698