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

Unified Diff: chrome/browser/resources/settings/appearance_page/appearance_page.js

Issue 2403353002: MD Settings: Stop calling chrome.settingsPrivate.setDefaultZoomLevel on startup. (Closed)
Patch Set: More Created 4 years, 2 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
« no previous file with comments | « chrome/browser/resources/settings/appearance_page/appearance_page.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/appearance_page/appearance_page.js
diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.js b/chrome/browser/resources/settings/appearance_page/appearance_page.js
index 7e0661d84332362a128b891145cb4aff12e4f664..e8bac2aaf030ae0cba4341dc42c4fdadd3c4c5c0 100644
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.js
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.js
@@ -34,17 +34,6 @@ Polymer({
value: false, // Can only be true on Linux, but value exists everywhere.
},
- /** @private */
- defaultZoomLevel_: {
- notify: true,
- type: Object,
- value: function() {
- return {
- type: chrome.settingsPrivate.PrefType.NUMBER,
- };
- },
- },
-
/**
* List of options for the font size drop-down menu.
* @type {!DropdownMenuOptionList}
@@ -111,8 +100,6 @@ Polymer({
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
</if>
-
- 'zoomLevelChanged_(defaultZoomLevel_.value)',
],
created: function() {
@@ -121,11 +108,13 @@ Polymer({
ready: function() {
this.$.defaultFontSize.menuOptions = this.fontSizeOptions_;
- this.$.pageZoom.menuOptions = this.pageZoomOptions_;
// TODO(dschuyler): Look into adding a listener for the
// default zoom percent.
- chrome.settingsPrivate.getDefaultZoomPercent(
- this.zoomPrefChanged_.bind(this));
+ chrome.settingsPrivate.getDefaultZoomPercent(function(value) {
+ // TODO(dpapad): Non-integer values will cause no <option> to be selected
+ // until crbug.com/655742 is addressed.
+ this.$.zoomLevel.value = value;
+ }.bind(this));
},
/**
@@ -228,23 +217,10 @@ Polymer({
this.themeUrl_ = '';
},
- /**
- * @param {number} percent The integer percentage of the page zoom.
- * @private
- */
- zoomPrefChanged_: function(percent) {
- this.set('defaultZoomLevel_.value', percent);
- },
-
- /**
- * @param {number} percent The integer percentage of the page zoom.
- * @private
- */
- zoomLevelChanged_: function(percent) {
- // The |percent| may be undefined on startup.
- if (percent === undefined)
- return;
- chrome.settingsPrivate.setDefaultZoomPercent(percent);
+ /** @private */
+ onZoomLevelChange_: function() {
+ chrome.settingsPrivate.setDefaultZoomPercent(
+ parseFloat(this.$.zoomLevel.value));
},
/**
« no previous file with comments | « chrome/browser/resources/settings/appearance_page/appearance_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698