| Index: chrome/browser/resources/settings/site_settings/category_default_setting.js
|
| diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chrome/browser/resources/settings/site_settings/category_default_setting.js
|
| index f481cc5da4e70946fdd431ff5e69be2ddac81274..c1c3c99b3f0a369ef80a21fc2b1e738f3b3651bb 100644
|
| --- a/chrome/browser/resources/settings/site_settings/category_default_setting.js
|
| +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.js
|
| @@ -50,6 +50,12 @@ Polymer({
|
| /* Labels for the toggle on/off positions. */
|
| toggleOffLabel: String,
|
| toggleOnLabel: String,
|
| +
|
| + subOptionLabel: String,
|
| + subOptionSecondary: {
|
| + type: String,
|
| + value: null, // Needs default value so binding fires upon initialization.
|
| + },
|
| },
|
|
|
| observers: [
|
| @@ -208,5 +214,15 @@ Polymer({
|
| isToggleDisabled_: function() {
|
| return this.category == settings.ContentSettingsTypes.POPUPS &&
|
| loadTimeData.getBoolean('isGuest');
|
| + },
|
| +
|
| + /**
|
| + * Returns classname to indicate secondary label exists.
|
| + * @param {boolean} subOptionLabel
|
| + * @return {string}
|
| + * @private
|
| + */
|
| + subOptionClass_: function(subOptionLabel) {
|
| + return subOptionLabel ? 'two-line' : '';
|
| }
|
| });
|
|
|