| 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 37a6a96e37471eeacc024b68ee7b96fa06e25525..289e20bdbd4ebc0240bbd7e127c20579ecd8e3af 100644
|
| --- a/chrome/browser/resources/settings/appearance_page/appearance_page.js
|
| +++ b/chrome/browser/resources/settings/appearance_page/appearance_page.js
|
| @@ -122,16 +122,18 @@ Polymer({
|
| 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
|
| 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)',
|
|
|
| - // <if expr="is_linux and not chromeos">
|
| +// <if expr="is_linux and not chromeos">
|
| // NOTE: this pref only exists on Linux.
|
| 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
|
| - // </if>
|
| +// </if>
|
| ],
|
|
|
| + /** @override */
|
| created: function() {
|
| this.browserProxy_ = settings.AppearanceBrowserProxyImpl.getInstance();
|
| },
|
|
|
| + /** @override */
|
| ready: function() {
|
| this.$.defaultFontSize.menuOptions = this.fontSizeOptions_;
|
| // TODO(dschuyler): Look into adding a listener for the
|
| @@ -196,7 +198,7 @@ Polymer({
|
| return this.themeUrl_ || loadTimeData.getString('themesGalleryUrl');
|
| },
|
|
|
| - // <if expr="chromeos">
|
| +// <if expr="chromeos">
|
| /**
|
| * ChromeOS only.
|
| * @private
|
| @@ -204,14 +206,14 @@ Polymer({
|
| openWallpaperManager_: function() {
|
| this.browserProxy_.openWallpaperManager();
|
| },
|
| - // </if>
|
| +// </if>
|
|
|
| /** @private */
|
| onUseDefaultTap_: function() {
|
| this.browserProxy_.useDefaultTheme();
|
| },
|
|
|
| - // <if expr="is_linux and not chromeos">
|
| +// <if expr="is_linux and not chromeos">
|
| /**
|
| * @param {boolean} useSystemTheme
|
| * @private
|
| @@ -256,7 +258,7 @@ Polymer({
|
| onUseSystemTap_: function() {
|
| this.browserProxy_.useSystemTheme();
|
| },
|
| - // </if>
|
| +// </if>
|
|
|
| /**
|
| * @param {string} themeId
|
| @@ -276,12 +278,12 @@ Polymer({
|
| }
|
|
|
| var i18nId;
|
| - // <if expr="is_linux and not chromeos">
|
| +// <if expr="is_linux and not chromeos">
|
| i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
|
| - // </if>
|
| - // <if expr="not is_linux or chromeos">
|
| +// </if>
|
| +// <if expr="not is_linux or chromeos">
|
| i18nId = 'chooseFromWebStore';
|
| - // </if>
|
| +// </if>
|
| this.themeSublabel_ = this.i18n(i18nId);
|
| this.themeUrl_ = '';
|
| },
|
|
|