diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 10:35:49 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 10:35:49 +0000 |
| commit | 7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb (patch) | |
| tree | 846e0e2898ea5fac9c772c584ecf5d516c54ce36 /chrome/browser/printing | |
| parent | b7afd53b3c20c8229b3f93a4ecc6bc9aecf6f2cb (diff) | |
| download | chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.zip chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.tar.gz chromium_src-7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb.tar.bz2 | |
Add more per-tab preferences.
intl.global.charset_default
webkit.webprefs.global.standard_font_family
webkit.webprefs.global.fixed_font_family
webkit.webprefs.global.serif_font_family
webkit.webprefs.global.sansserif_font_family
webkit.webprefs.global.cursive_font_family
webkit.webprefs.global.fantasy_font_family
webkit.webprefs.global.default_font_size
webkit.webprefs.global.default_fixed_font_size
webkit.webprefs.global.minimum_font_size
webkit.webprefs.global.minimum_logical_font_size
webkit.webprefs.global.javascript_can_open_windows_automatically
webkit.webprefs.global.loads_images_automatically
webkit.webprefs.global.plugins_enabled
BUG=105537
TEST=PrefsTabHelperTest*,PrefsTabHelperBrowserTest*
For files that has only prefs names changes and require OWNERS approval:
TBR=erikwright@chromium.org,gene@chromium.org,csilv@chromium.org,atwilson@chromium.org,mirandac@chromium.org
Review URL: http://codereview.chromium.org/8879016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115955 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index e368150..88e5ad8 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -134,8 +134,8 @@ void CloudPrintSetupFlow::GetWebUIMessageHandlers( void CloudPrintSetupFlow::GetDialogSize(gfx::Size* size) const { PrefService* prefs = profile_->GetPrefs(); gfx::Font approximate_web_font( - prefs->GetString(prefs::kWebKitSansSerifFontFamily), - prefs->GetInteger(prefs::kWebKitDefaultFontSize)); + prefs->GetString(prefs::kWebKitGlobalSansSerifFontFamily), + prefs->GetInteger(prefs::kWebKitGlobalDefaultFontSize)); if (setup_done_) { *size = ui::GetLocalizedContentsSizeForFont( @@ -316,8 +316,8 @@ void CloudPrintSetupFlow::ShowSetupDone() { if (web_ui_) { PrefService* prefs = profile_->GetPrefs(); gfx::Font approximate_web_font( - prefs->GetString(prefs::kWebKitSansSerifFontFamily), - prefs->GetInteger(prefs::kWebKitDefaultFontSize)); + prefs->GetString(prefs::kWebKitGlobalSansSerifFontFamily), + prefs->GetInteger(prefs::kWebKitGlobalDefaultFontSize)); gfx::Size done_size = ui::GetLocalizedContentsSizeForFont( IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_WIDTH_CHARS, IDS_CLOUD_PRINT_SETUP_WIZARD_DONE_HEIGHT_LINES, |