Index: chrome/common/pref_names.h |
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h |
index 10ab3f74aa933dfabba30ff58a91dbc00426aa63..9350b6fdc99f4dd44d4e341e7ca604db9dc33a20 100644 |
--- a/chrome/common/pref_names.h |
+++ b/chrome/common/pref_names.h |
@@ -37,23 +37,33 @@ extern const char kApplicationLocaleAccepted[]; |
extern const char kOwnerLocale[]; |
#endif |
+// Obselete keys, kept only for migration code to the new keys. See |
+// http://crbug.com/123812 |
+extern const char kWebKitGlobalStandardFontFamily[]; |
+extern const char kWebKitGlobalFixedFontFamily[]; |
+extern const char kWebKitGlobalSerifFontFamily[]; |
+extern const char kWebKitGlobalSansSerifFontFamily[]; |
+extern const char kWebKitGlobalCursiveFontFamily[]; |
+extern const char kWebKitGlobalFantasyFontFamily[]; |
+extern const char kWebKitOldStandardFontFamily[]; |
+extern const char kWebKitOldFixedFontFamily[]; |
+extern const char kWebKitOldSerifFontFamily[]; |
+extern const char kWebKitOldSansSerifFontFamily[]; |
+extern const char kWebKitOldCursiveFontFamily[]; |
+extern const char kWebKitOldFantasyFontFamily[]; |
+ |
extern const char kGlobalDefaultCharset[]; |
extern const char kDefaultCharset[]; |
extern const char kAcceptLanguages[]; |
extern const char kStaticEncodings[]; |
extern const char kShowBookmarkBar[]; |
extern const char kBookmarkEditorExpandedNodes[]; |
-extern const char kWebKitGlobalStandardFontFamily[]; |
+extern const char kWebKitCommonScript[]; |
extern const char kWebKitStandardFontFamily[]; |
-extern const char kWebKitGlobalFixedFontFamily[]; |
extern const char kWebKitFixedFontFamily[]; |
-extern const char kWebKitGlobalSerifFontFamily[]; |
extern const char kWebKitSerifFontFamily[]; |
-extern const char kWebKitGlobalSansSerifFontFamily[]; |
extern const char kWebKitSansSerifFontFamily[]; |
-extern const char kWebKitGlobalCursiveFontFamily[]; |
extern const char kWebKitCursiveFontFamily[]; |
-extern const char kWebKitGlobalFantasyFontFamily[]; |
extern const char kWebKitFantasyFontFamily[]; |
extern const char kWebKitStandardFontFamilyMap[]; |
extern const char kWebKitFixedFontFamilyMap[]; |