| Index: chrome/browser/resources/options/pref_ui.js
|
| ===================================================================
|
| --- chrome/browser/resources/options/pref_ui.js (revision 57107)
|
| +++ chrome/browser/resources/options/pref_ui.js (working copy)
|
| @@ -33,7 +33,7 @@
|
| // Listen to user events.
|
| this.addEventListener('click',
|
| function(e) {
|
| - Preferences.setBooleanPref(self.pref, self.checked);
|
| + Preferences.setBooleanPref(self.pref, self.checked, self.metric);
|
| });
|
| }
|
| };
|
| @@ -44,6 +44,12 @@
|
| */
|
| cr.defineProperty(PrefCheckbox, 'pref', cr.PropertyKind.ATTR);
|
|
|
| + /**
|
| + * The user metric string.
|
| + * @type {string}
|
| + */
|
| + cr.defineProperty(PrefCheckbox, 'metric', cr.PropertyKind.ATTR);
|
| +
|
| /////////////////////////////////////////////////////////////////////////////
|
| // PrefRadio class:
|
|
|
| @@ -74,10 +80,10 @@
|
| function(e) {
|
| if(self.value == 'true' || self.value == 'false') {
|
| Preferences.setBooleanPref(self.pref,
|
| - self.value == 'true');
|
| + self.value == 'true', self.metric);
|
| } else {
|
| Preferences.setIntegerPref(self.pref,
|
| - parseInt(self.value, 10));
|
| + parseInt(self.value, 10), self.metric);
|
| }
|
| });
|
| },
|
| @@ -97,6 +103,11 @@
|
| }
|
| };
|
|
|
| + /**
|
| + * The user metric string.
|
| + * @type {string}
|
| + */
|
| + cr.defineProperty(PrefRadio, 'metric', cr.PropertyKind.ATTR);
|
|
|
| /////////////////////////////////////////////////////////////////////////////
|
| // PrefNumeric class:
|
| @@ -124,7 +135,7 @@
|
| // Listen to user events.
|
| this.addEventListener('change',
|
| function(e) {
|
| - Preferences.setIntegerPref(self.pref, self.value);
|
| + Preferences.setIntegerPref(self.pref, self.value, self.metric);
|
| });
|
| }
|
| };
|
| @@ -135,6 +146,12 @@
|
| */
|
| cr.defineProperty(PrefNumeric, 'pref', cr.PropertyKind.ATTR);
|
|
|
| + /**
|
| + * The user metric string.
|
| + * @type {string}
|
| + */
|
| + cr.defineProperty(PrefNumeric, 'metric', cr.PropertyKind.ATTR);
|
| +
|
| /////////////////////////////////////////////////////////////////////////////
|
| // PrefNumber class:
|
|
|
| @@ -209,15 +226,15 @@
|
| switch(self.dataType) {
|
| case 'number':
|
| Preferences.setIntegerPref(self.pref,
|
| - self.options[self.selectedIndex].value);
|
| + self.options[self.selectedIndex].value, self.metric);
|
| break;
|
| case 'boolean':
|
| Preferences.setBooleanValue(self.pref,
|
| - self.options[self.selectedIndex].value);
|
| + self.options[self.selectedIndex].value, self.metric);
|
| break;
|
| case 'string':
|
| Preferences.setStringPref(self.pref,
|
| - self.options[self.selectedIndex].value);
|
| + self.options[self.selectedIndex].value, self.metric);
|
| break;
|
| }
|
| });
|
| @@ -255,6 +272,12 @@
|
| */
|
| cr.defineProperty(PrefSelect, 'pref', cr.PropertyKind.ATTR);
|
|
|
| + /**
|
| + * The user metric string.
|
| + * @type {string}
|
| + */
|
| + cr.defineProperty(PrefSelect, 'metric', cr.PropertyKind.ATTR);
|
| +
|
| /////////////////////////////////////////////////////////////////////////////
|
| // PrefTextField class:
|
|
|
| @@ -282,7 +305,7 @@
|
| // Listen to user events.
|
| this.addEventListener('change',
|
| function(e) {
|
| - Preferences.setStringPref(self.pref, self.value);
|
| + Preferences.setStringPref(self.pref, self.value, self.metric);
|
| });
|
|
|
| window.addEventListener('unload',
|
| @@ -299,6 +322,12 @@
|
| */
|
| cr.defineProperty(PrefTextField, 'pref', cr.PropertyKind.ATTR);
|
|
|
| + /**
|
| + * The user metric string.
|
| + * @type {string}
|
| + */
|
| + cr.defineProperty(PrefTextField, 'metric', cr.PropertyKind.ATTR);
|
| +
|
| // Export
|
| return {
|
| PrefCheckbox: PrefCheckbox,
|
|
|