Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Unified Diff: chrome/common/pref_names.cc

Issue 11336008: When a font family pref changes to the empty string, pass it to WebKit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/common/pref_names_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 892a6bcb5bf808042f59a1c802f936f81e8e58e9..1a39db04fb5192a6e01eb3f9e7e1b1f33531e079 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -165,20 +165,6 @@ const char kWebKitOldCursiveFontFamily[] =
"webkit.webprefs.cursive_font_family";
const char kWebKitOldFantasyFontFamily[] =
"webkit.webprefs.fantasy_font_family";
-const char kWebKitStandardFontFamilyMap[] =
- "webkit.webprefs.fonts.standard";
-const char kWebKitFixedFontFamilyMap[] =
- "webkit.webprefs.fonts.fixed";
-const char kWebKitSerifFontFamilyMap[] =
- "webkit.webprefs.fonts.serif";
-const char kWebKitSansSerifFontFamilyMap[] =
- "webkit.webprefs.fonts.sansserif";
-const char kWebKitCursiveFontFamilyMap[] =
- "webkit.webprefs.fonts.cursive";
-const char kWebKitFantasyFontFamilyMap[] =
- "webkit.webprefs.fonts.fantasy";
-const char kWebKitPictographFontFamilyMap[] =
- "webkit.webprefs.fonts.pictograph";
// If these change, the corresponding enums in the extension API
// experimental.fontSettings.json must also change.
@@ -205,7 +191,23 @@ const char* const kWebKitScriptsForFontFamilyMaps[] = {
const size_t kWebKitScriptsForFontFamilyMapsLength =
arraysize(kWebKitScriptsForFontFamilyMaps);
-// WebKit preferences.
+// Strings for WebKit font family preferences. If these change, the pref prefix
+// in pref_names_util.cc and the pref format in font_settings_api.cc must also
+// change.
+const char kWebKitStandardFontFamilyMap[] =
+ "webkit.webprefs.fonts.standard";
+const char kWebKitFixedFontFamilyMap[] =
+ "webkit.webprefs.fonts.fixed";
+const char kWebKitSerifFontFamilyMap[] =
+ "webkit.webprefs.fonts.serif";
+const char kWebKitSansSerifFontFamilyMap[] =
+ "webkit.webprefs.fonts.sansserif";
+const char kWebKitCursiveFontFamilyMap[] =
+ "webkit.webprefs.fonts.cursive";
+const char kWebKitFantasyFontFamilyMap[] =
+ "webkit.webprefs.fonts.fantasy";
+const char kWebKitPictographFontFamilyMap[] =
+ "webkit.webprefs.fonts.pictograph";
const char kWebKitStandardFontFamilyArabic[] =
"webkit.webprefs.fonts.standard.Arab";
const char kWebKitFixedFontFamilyArabic[] =
@@ -265,6 +267,7 @@ const char kWebKitSerifFontFamilyTraditionalHan[] =
const char kWebKitSansSerifFontFamilyTraditionalHan[] =
"webkit.webprefs.fonts.sansserif.Hant";
+// WebKit preferences.
const char kWebKitWebSecurityEnabled[] = "webkit.webprefs.web_security_enabled";
const char kWebKitDomPasteEnabled[] = "webkit.webprefs.dom_paste_enabled";
const char kWebKitShrinksStandaloneImagesToFit[] =
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/common/pref_names_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698