Move webkit/common/webpreferences to content/public/common/

content/public/common/webpreferences.h

Index: content/public/common/webpreferences.h
diff --git a/webkit/common/webpreferences.h b/content/public/common/webpreferences.h
similarity index 87%
rename from webkit/common/webpreferences.h
rename to content/public/common/webpreferences.h
index 0fadd26ed2e0c48c189259b08c5108ae62b4ba03..07fde31ca347a3a1c00da7f6441fbd12b3f4b717 100644
--- a/webkit/common/webpreferences.h
+++ b/content/public/common/webpreferences.h
@@ -8,16 +8,16 @@
 // blink::WebSettings, content/common/view_messages.h, browser/tab_contents/
 // render_view_host_delegate_helper.cc, and browser/profiles/profile.cc.
 
-#ifndef WEBKIT_COMMON_WEBPREFERENCES_H__
-#define WEBKIT_COMMON_WEBPREFERENCES_H__
+#ifndef CONTENT_PUBLIC_COMMON_WEBPREFERENCES_H__
+#define CONTENT_PUBLIC_COMMON_WEBPREFERENCES_H__
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
+#include "content/common/content_export.h"
 #include "url/gurl.h"
-#include "webkit/common/webkit_common_export.h"
 
 namespace blink {
 class WebView;
@@ -25,7 +25,7 @@ class WebView;
 
 struct WebPreferences;
 
-namespace webkit_glue {
+namespace content {
 
 // Map of ISO 15924 four-letter script code to font family.  For example,
 // "Arab" to "My Arabic Font".
@@ -45,18 +45,18 @@ enum EditingBehavior {
 // The ISO 15924 script code for undetermined script aka Common. It's the
 // default used on WebKit's side to get/set a font setting when no script is
 // specified.
-WEBKIT_COMMON_EXPORT extern const char kCommonScript[];
-
-}  // namespace webkit_glue
-
-struct WEBKIT_COMMON_EXPORT WebPreferences {
-  webkit_glue::ScriptFontFamilyMap standard_font_family_map;
-  webkit_glue::ScriptFontFamilyMap fixed_font_family_map;
-  webkit_glue::ScriptFontFamilyMap serif_font_family_map;
-  webkit_glue::ScriptFontFamilyMap sans_serif_font_family_map;
-  webkit_glue::ScriptFontFamilyMap cursive_font_family_map;
-  webkit_glue::ScriptFontFamilyMap fantasy_font_family_map;
-  webkit_glue::ScriptFontFamilyMap pictograph_font_family_map;
+CONTENT_EXPORT extern const char kCommonScript[];
+
+}  // namespace content
+
+struct CONTENT_EXPORT WebPreferences {

[jam, 2014/01/30 00:08:45]

everything in src/content should be in the content namespace

+  content::ScriptFontFamilyMap standard_font_family_map;
+  content::ScriptFontFamilyMap fixed_font_family_map;
+  content::ScriptFontFamilyMap serif_font_family_map;
+  content::ScriptFontFamilyMap sans_serif_font_family_map;
+  content::ScriptFontFamilyMap cursive_font_family_map;
+  content::ScriptFontFamilyMap fantasy_font_family_map;
+  content::ScriptFontFamilyMap pictograph_font_family_map;
   int default_font_size;
   int default_fixed_font_size;
   int minimum_font_size;
@@ -69,7 +69,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
   bool images_enabled;
   bool plugins_enabled;
   bool dom_paste_enabled;
-  webkit_glue::WebInspectorPreferences inspector_settings;
+  content::WebInspectorPreferences inspector_settings;
   bool site_specific_quirks_enabled;
   bool shrinks_standalone_images_to_fit;
   bool uses_universal_detector;
@@ -147,7 +147,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
   bool deferred_image_decoding_enabled;
   bool should_respect_image_orientation;
   int number_of_cpu_cores;
-  webkit_glue::EditingBehavior editing_behavior;
+  content::EditingBehavior editing_behavior;
   bool supports_multiple_windows;
   bool viewport_enabled;
   bool viewport_meta_enabled;
@@ -197,4 +197,4 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
   ~WebPreferences();
 };
 
-#endif  // WEBKIT_COMMON_WEBPREFERENCES_H__
+#endif  // CONTENT_PUBLIC_COMMON_WEBPREFERENCES_H__