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

content/public/common/webpreferences.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A struct for managing webkit's settings.
 //
 // Adding new values to this class probably involves updating
 // 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;
 }
 
 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".
 typedef std::map<std::string, base::string16> ScriptFontFamilyMap;
 
 typedef std::vector<std::pair<std::string, std::string> >
     WebInspectorPreferences;
 
 enum EditingBehavior {

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

per content api, each struct/class/enum would go in its own class
(http://www.chromium.org/developers/content-module/content-api)

I looked at the change that added this, looks like a boolean can suffice instead
of another enum: use_windows_layout

   EDITING_BEHAVIOR_MAC,
   EDITING_BEHAVIOR_WIN,
   EDITING_BEHAVIOR_UNIX,
   EDITING_BEHAVIOR_ANDROID
 };
 
 
 // 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[];
+CONTENT_EXPORT extern const char kCommonScript[];
 
-}  // namespace webkit_glue
+}  // namespace content
 
-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;
+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;
   int minimum_logical_font_size;
   std::string default_encoding;
   bool javascript_enabled;
   bool web_security_enabled;
   bool javascript_can_open_windows_automatically;
   bool loads_images_automatically;
   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;
   bool text_areas_are_resizable;
   bool java_enabled;
   bool allow_scripts_to_close_windows;
   bool remote_fonts_enabled;
   bool javascript_can_access_clipboard;
   bool xslt_enabled;
   bool xss_auditor_enabled;
@@ skipping 57 matching lines @@
   bool touch_enabled;
   bool device_supports_touch;
   bool device_supports_mouse;
   bool touch_adjustment_enabled;
   int pointer_events_max_touch_points;
   bool fixed_position_creates_stacking_context;
   bool sync_xhr_in_documents_enabled;
   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;
   bool main_frame_resizes_are_orientation_changes;
   bool initialize_at_minimum_page_scale;
   bool smart_insert_delete_enabled;
   bool spatial_navigation_enabled;
   bool experimental_websocket_enabled;
   bool pinch_virtual_viewport_enabled;
   int pinch_overlay_scrollbar_thickness;
@@ skipping 29 matching lines @@
   bool report_screen_size_in_physical_pixels_quirk;
 #endif
 
   // We try to keep the default values the same as the default values in
   // chrome, except for the cases where it would require lots of extra work for
   // the embedder to use the same default value.
   WebPreferences();
   ~WebPreferences();
 };
 
-#endif  // WEBKIT_COMMON_WEBPREFERENCES_H__
+#endif  // CONTENT_PUBLIC_COMMON_WEBPREFERENCES_H__