diff options
author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 22:36:01 +0000 |
---|---|---|
committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 22:36:01 +0000 |
commit | d47647130e1b98713856a87884acae58c46fc598 (patch) | |
tree | 1ee5aaeea2164ae0e2d3028cdbffb404c9f7924e /chrome/common | |
parent | 2a73f6767b776fecbbd38b798699bb119da0aede (diff) | |
download | chromium_src-d47647130e1b98713856a87884acae58c46fc598.zip chromium_src-d47647130e1b98713856a87884acae58c46fc598.tar.gz chromium_src-d47647130e1b98713856a87884acae58c46fc598.tar.bz2 |
Remove the migration code for old font preferences.
The migration was introduced in May 2012 in crrev.com/137835 and
crrev.com/138219. We don't need to support migrating these old prefs
anymore; if someone has an old profile with them they will just be
ignored.
BUG=127372
Review URL: https://codereview.chromium.org/27703002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/pref_names.cc | 41 | ||||
-rw-r--r-- | chrome/common/pref_names.h | 24 |
2 files changed, 0 insertions, 65 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index f248505..d6dbb32 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -150,47 +150,6 @@ const char kAcceptLanguages[] = "intl.accept_languages"; // stored in non-translatable part of the resource bundle. const char kStaticEncodings[] = "intl.static_encodings"; -// Obselete WebKit prefs for migration. -const char kGlobalDefaultCharset[] = "intl.global.charset_default"; -const char kWebKitGlobalDefaultFontSize[] = - "webkit.webprefs.global.default_font_size"; -const char kWebKitGlobalDefaultFixedFontSize[] = - "webkit.webprefs.global.default_fixed_font_size"; -const char kWebKitGlobalMinimumFontSize[] = - "webkit.webprefs.global.minimum_font_size"; -const char kWebKitGlobalMinimumLogicalFontSize[] = - "webkit.webprefs.global.minimum_logical_font_size"; -const char kWebKitGlobalJavascriptCanOpenWindowsAutomatically[] = - "webkit.webprefs.global.javascript_can_open_windows_automatically"; -const char kWebKitGlobalJavascriptEnabled[] = - "webkit.webprefs.global.javascript_enabled"; -const char kWebKitGlobalLoadsImagesAutomatically[] = - "webkit.webprefs.global.loads_images_automatically"; -const char kWebKitGlobalPluginsEnabled[] = - "webkit.webprefs.global.plugins_enabled"; -const char kWebKitGlobalStandardFontFamily[] = - "webkit.webprefs.global.standard_font_family"; -const char kWebKitGlobalFixedFontFamily[] = - "webkit.webprefs.global.fixed_font_family"; -const char kWebKitGlobalSerifFontFamily[] = - "webkit.webprefs.global.serif_font_family"; -const char kWebKitGlobalSansSerifFontFamily[] = - "webkit.webprefs.global.sansserif_font_family"; -const char kWebKitGlobalCursiveFontFamily[] = - "webkit.webprefs.global.cursive_font_family"; -const char kWebKitGlobalFantasyFontFamily[] = - "webkit.webprefs.global.fantasy_font_family"; -const char kWebKitOldStandardFontFamily[] = - "webkit.webprefs.standard_font_family"; -const char kWebKitOldFixedFontFamily[] = "webkit.webprefs.fixed_font_family"; -const char kWebKitOldSerifFontFamily[] = "webkit.webprefs.serif_font_family"; -const char kWebKitOldSansSerifFontFamily[] = - "webkit.webprefs.sansserif_font_family"; -const char kWebKitOldCursiveFontFamily[] = - "webkit.webprefs.cursive_font_family"; -const char kWebKitOldFantasyFontFamily[] = - "webkit.webprefs.fantasy_font_family"; - // If these change, the corresponding enums in the extension API // experimental.fontSettings.json must also change. const char* const kWebKitScriptsForFontFamilyMaps[] = { diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 85f7c76..93911c7 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -45,30 +45,6 @@ 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 kGlobalDefaultCharset[]; -extern const char kWebKitGlobalDefaultFontSize[]; -extern const char kWebKitGlobalDefaultFixedFontSize[]; -extern const char kWebKitGlobalMinimumFontSize[]; -extern const char kWebKitGlobalMinimumLogicalFontSize[]; -extern const char kWebKitGlobalJavascriptEnabled[]; -extern const char kWebKitGlobalJavascriptCanOpenWindowsAutomatically[]; -extern const char kWebKitGlobalLoadsImagesAutomatically[]; -extern const char kWebKitGlobalPluginsEnabled[]; -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 kDefaultCharset[]; extern const char kAcceptLanguages[]; extern const char kStaticEncodings[]; |