| Index: chrome/common/pref_names.h
|
| diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
| index 5645621af284d2cefef9bdb84f0783f6837413ce..09b297b5cc258eaad51e5aed4a960ef382359776 100644
|
| --- a/chrome/common/pref_names.h
|
| +++ b/chrome/common/pref_names.h
|
| @@ -35,17 +35,24 @@ extern const char kApplicationLocaleAccepted[];
|
| extern const char kOwnerLocale[];
|
| #endif
|
|
|
| +extern const char kGlobalDefaultCharset[];
|
| extern const char kDefaultCharset[];
|
| extern const char kAcceptLanguages[];
|
| extern const char kStaticEncodings[];
|
| extern const char kPopupWhitelistedHosts[];
|
| extern const char kShowBookmarkBar[];
|
| extern const char kBookmarkEditorExpandedNodes[];
|
| +extern const char kWebKitGlobalStandardFontFamily[];
|
| 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[];
|
| @@ -83,15 +90,23 @@ extern const char kWebKitFixedFontFamilyTraditionalHan[];
|
| extern const char kWebKitSerifFontFamilyTraditionalHan[];
|
| extern const char kWebKitSansSerifFontFamilyTraditionalHan[];
|
|
|
| +extern const char kWebKitSettingsMigratedToGlobal[];
|
| +extern const char kWebKitGlobalDefaultFontSize[];
|
| extern const char kWebKitDefaultFontSize[];
|
| +extern const char kWebKitGlobalDefaultFixedFontSize[];
|
| extern const char kWebKitDefaultFixedFontSize[];
|
| +extern const char kWebKitGlobalMinimumFontSize[];
|
| extern const char kWebKitMinimumFontSize[];
|
| +extern const char kWebKitGlobalMinimumLogicalFontSize[];
|
| extern const char kWebKitMinimumLogicalFontSize[];
|
| -extern const char kWebKitJavascriptEnabled[];
|
| extern const char kWebKitGlobalJavascriptEnabled[];
|
| +extern const char kWebKitJavascriptEnabled[];
|
| extern const char kWebKitWebSecurityEnabled[];
|
| +extern const char kWebKitGlobalJavascriptCanOpenWindowsAutomatically[];
|
| extern const char kWebKitJavascriptCanOpenWindowsAutomatically[];
|
| +extern const char kWebKitGlobalLoadsImagesAutomatically[];
|
| extern const char kWebKitLoadsImagesAutomatically[];
|
| +extern const char kWebKitGlobalPluginsEnabled[];
|
| extern const char kWebKitPluginsEnabled[];
|
| extern const char kWebKitDomPasteEnabled[];
|
| extern const char kWebKitShrinksStandaloneImagesToFit[];
|
|
|