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/net/chrome_url_request_context.cc | |
| 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/net/chrome_url_request_context.cc')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 5a71d38..b303d13 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -279,9 +279,9 @@ void ChromeURLRequestContextGetter::Observe( &ChromeURLRequestContextGetter::OnAcceptLanguageChange, this, accept_language)); - } else if (*pref_name_in == prefs::kDefaultCharset) { + } else if (*pref_name_in == prefs::kGlobalDefaultCharset) { std::string default_charset = - prefs->GetString(prefs::kDefaultCharset); + prefs->GetString(prefs::kGlobalDefaultCharset); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind( @@ -308,7 +308,7 @@ void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) { registrar_.Init(profile->GetPrefs()); registrar_.Add(prefs::kAcceptLanguages, this); - registrar_.Add(prefs::kDefaultCharset, this); + registrar_.Add(prefs::kGlobalDefaultCharset, this); registrar_.Add(prefs::kClearSiteDataOnExit, this); } |