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

content/public/common/webpreferences.cc

Index: content/public/common/webpreferences.cc
diff --git a/webkit/common/webpreferences.cc b/content/public/common/webpreferences.cc
similarity index 83%
rename from webkit/common/webpreferences.cc
rename to content/public/common/webpreferences.cc
index dd62e9f646909a15b1f51389ebfe7cfa2641019f..d395f293b40d63563a6e1688a049f0b89c52cc66 100644
--- a/webkit/common/webpreferences.cc
+++ b/content/public/common/webpreferences.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/common/webpreferences.h"
+#include "content/public/common/webpreferences.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
@@ -100,15 +100,15 @@ WebPreferences::WebPreferences()
       should_respect_image_orientation(false),
       number_of_cpu_cores(1),
 #if defined(OS_MACOSX)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_MAC),
+      editing_behavior(content::EDITING_BEHAVIOR_MAC),
 #elif defined(OS_WIN)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_WIN),
+      editing_behavior(content::EDITING_BEHAVIOR_WIN),
 #elif defined(OS_ANDROID)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_ANDROID),
+      editing_behavior(content::EDITING_BEHAVIOR_ANDROID),
 #elif defined(OS_POSIX)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_UNIX),
+      editing_behavior(content::EDITING_BEHAVIOR_UNIX),
 #else
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_MAC),
+      editing_behavior(content::EDITING_BEHAVIOR_MAC),
 #endif
       supports_multiple_windows(true),
       viewport_enabled(false),
@@ -149,42 +149,42 @@ WebPreferences::WebPreferences()
       report_screen_size_in_physical_pixels_quirk(false)
 #endif
 {
-  standard_font_family_map[webkit_glue::kCommonScript] =
+  standard_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Times New Roman");
-  fixed_font_family_map[webkit_glue::kCommonScript] =
+  fixed_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Courier New");
-  serif_font_family_map[webkit_glue::kCommonScript] =
+  serif_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Times New Roman");
-  sans_serif_font_family_map[webkit_glue::kCommonScript] =
+  sans_serif_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Arial");
-  cursive_font_family_map[webkit_glue::kCommonScript] =
+  cursive_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Script");
-  fantasy_font_family_map[webkit_glue::kCommonScript] =
+  fantasy_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Impact");
-  pictograph_font_family_map[webkit_glue::kCommonScript] =
+  pictograph_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Times New Roman");
 }
 
 WebPreferences::~WebPreferences() {
 }
 
-namespace webkit_glue {
+namespace content {
 
 // "Zyyy" is the ISO 15924 script code for undetermined script aka Common.
 const char kCommonScript[] = "Zyyy";
 
-#define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name)         \
+#define COMPILE_ASSERT_MATCHING_ENUMS(content_name, webkit_name)         \
     COMPILE_ASSERT(                                                          \
-        static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \
+        static_cast<int>(content_name) == static_cast<int>(webkit_name), \
         mismatching_enums)
 
 COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
+    content::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
 COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
+    content::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
 COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
+    content::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
 COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);
+    content::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);
 
-}  // namespace webkit_glue
+}  // namespace content