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

Unified Diff: chrome/browser/ui/webui/options/advanced_options_handler.cc

Issue 6672063: web-ui settings: Font setting fixes and improvements.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: more tweaks Created 9 years, 9 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
Index: chrome/browser/ui/webui/options/advanced_options_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/advanced_options_handler.cc (revision 78298)
+++ chrome/browser/ui/webui/options/advanced_options_handler.cc (working copy)
@@ -236,8 +236,6 @@
ask_for_save_location_.Init(prefs::kPromptForDownload, prefs, this);
auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this);
- default_fixed_font_size_.Init(prefs::kWebKitDefaultFixedFontSize, prefs,
- this);
proxy_prefs_.reset(
PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
@@ -326,8 +324,7 @@
if (cloud_print_proxy_ui_enabled_)
SetupCloudPrintProxySection();
#endif
- } else if (*pref_name == prefs::kWebKitDefaultFontSize ||
- *pref_name == prefs::kWebKitDefaultFixedFontSize) {
+ } else if (*pref_name == prefs::kWebKitDefaultFontSize) {
SetupFontSizeLabel();
}
}
@@ -392,7 +389,6 @@
if (ExtractIntegerValue(args, &font_size)) {
if (font_size > 0) {
default_font_size_.SetValue(font_size);
- default_fixed_font_size_.SetValue(font_size);
SetupFontSizeLabel();
}
}
@@ -559,10 +555,9 @@
void AdvancedOptionsHandler::SetupFontSizeLabel() {
// We're only interested in integer values, so convert to int.
- FundamentalValue fixed_font_size(default_fixed_font_size_.GetValue());
FundamentalValue font_size(default_font_size_.GetValue());
web_ui_->CallJavascriptFunction(
- "options.AdvancedOptions.SetFontSize", fixed_font_size, font_size);
+ "options.AdvancedOptions.SetFontSize", font_size);
}
void AdvancedOptionsHandler::SetupDownloadLocationPath() {

Powered by Google App Engine
This is Rietveld 408576698