| Index: chrome/browser/dom_ui/options/advanced_options_handler.cc
|
| diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
|
| index 17c1d904ff87dd95c0d4a56ee0c0702420d8ccfd..44033b7cc48cabdfde69c9ea3ab8ac2877501960 100644
|
| --- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
|
| +++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
|
| @@ -200,7 +200,6 @@ void AdvancedOptionsHandler::Initialize() {
|
| DCHECK(dom_ui_);
|
| SetupMetricsReportingCheckbox();
|
| SetupMetricsReportingSettingVisibility();
|
| - SetupDefaultZoomLevel();
|
| SetupFontSizeLabel();
|
| SetupDownloadLocationPath();
|
| SetupAutoOpenFileTypesDisabledAttribute();
|
| @@ -244,7 +243,6 @@ DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) {
|
| default_download_location_.Init(prefs::kDownloadDefaultDirectory,
|
| prefs, this);
|
| auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
|
| - default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this);
|
| default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this);
|
| default_fixed_font_size_.Init(prefs::kWebKitDefaultFixedFontSize, prefs,
|
| this);
|
| @@ -264,8 +262,6 @@ void AdvancedOptionsHandler::RegisterMessages() {
|
| dom_ui_->RegisterMessageCallback("autoOpenFileTypesAction",
|
| NewCallback(this,
|
| &AdvancedOptionsHandler::HandleAutoOpenButton));
|
| - dom_ui_->RegisterMessageCallback("defaultZoomLevelAction",
|
| - NewCallback(this, &AdvancedOptionsHandler::HandleDefaultZoomLevel));
|
| dom_ui_->RegisterMessageCallback("defaultFontSizeAction",
|
| NewCallback(this, &AdvancedOptionsHandler::HandleDefaultFontSize));
|
| #if !defined(OS_CHROMEOS)
|
| @@ -387,14 +383,6 @@ void AdvancedOptionsHandler::HandleMetricsReportingCheckbox(
|
| #endif
|
| }
|
|
|
| -void AdvancedOptionsHandler::HandleDefaultZoomLevel(const ListValue* args) {
|
| - UserMetricsRecordAction(UserMetricsAction("Options_ChangeDefaultZoomLevel"));
|
| - int zoom_level;
|
| - if (ExtractIntegerValue(args, &zoom_level)) {
|
| - default_zoom_level_.SetValue(static_cast<double>(zoom_level));
|
| - }
|
| -}
|
| -
|
| void AdvancedOptionsHandler::HandleDefaultFontSize(const ListValue* args) {
|
| int font_size;
|
| if (ExtractIntegerValue(args, &font_size)) {
|
| @@ -554,13 +542,6 @@ void AdvancedOptionsHandler::SetupMetricsReportingSettingVisibility() {
|
| #endif
|
| }
|
|
|
| -void AdvancedOptionsHandler::SetupDefaultZoomLevel() {
|
| - // We're only interested in integer values, so convert to int.
|
| - FundamentalValue value(static_cast<int>(default_zoom_level_.GetValue()));
|
| - dom_ui_->CallJavascriptFunction(
|
| - L"options.AdvancedOptions.SetDefaultZoomLevel", value);
|
| -}
|
| -
|
| void AdvancedOptionsHandler::SetupFontSizeLabel() {
|
| // We're only interested in integer values, so convert to int.
|
| FundamentalValue fixed_font_size(default_fixed_font_size_.GetValue());
|
|
|