From 7a5f593e856ea4a0733a8d3665b0ca5ea3410fcb Mon Sep 17 00:00:00 2001 From: "mnaganov@chromium.org" Date: Thu, 29 Dec 2011 10:35:49 +0000 Subject: 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 --- chrome/browser/ui/toolbar/encoding_menu_controller.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chrome/browser/ui/toolbar/encoding_menu_controller.cc') diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc index d28a437..9230618 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -85,8 +85,10 @@ bool EncodingMenuController::IsItemChecked( return false; std::string encoding = current_tab_encoding; - if (encoding.empty()) - encoding = browser_profile->GetPrefs()->GetString(prefs::kDefaultCharset); + if (encoding.empty()) { + encoding = + browser_profile->GetPrefs()->GetString(prefs::kGlobalDefaultCharset); + } if (item_id == IDC_ENCODING_AUTO_DETECT) { return browser_profile->GetPrefs()->GetBoolean( -- cgit v1.1