| Index: chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| index d550e32aaa16f85e398d09fdfa7b8d7ac62796bb..1ece5795f1c8a3e0e6dc218cdbae991f927cf861 100644
|
| --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js
|
| @@ -11,8 +11,9 @@
|
| * <settings-ui prefs="{{prefs}}"></settings-ui>
|
| */
|
| cr.exportPath('settings');
|
| -assert(!settings.defaultResourceLoaded,
|
| - 'settings_ui.js run twice. You probably have an invalid import.');
|
| +assert(
|
| + !settings.defaultResourceLoaded,
|
| + 'settings_ui.js run twice. You probably have an invalid import.');
|
| /** Global defined when the main Settings script runs. */
|
| settings.defaultResourceLoaded = true;
|
|
|
| @@ -92,12 +93,12 @@ Polymer({
|
| people: false,
|
| onStartup: false,
|
| reset: false,
|
| -<if expr="not chromeos">
|
| + /* <if expr="not chromeos"> */
|
| appearance: false,
|
| defaultBrowser: false,
|
| advancedSettings: false,
|
| -</if>
|
| -<if expr="chromeos">
|
| + /* </if> */
|
| + /* <if expr="chromeos"> */
|
| appearance: {
|
| setWallpaper: false,
|
| setTheme: false,
|
| @@ -114,7 +115,7 @@ Polymer({
|
| downloads: {
|
| googleDrive: false,
|
| },
|
| -</if>
|
| + /* </if> */
|
| };
|
| }
|
|
|
| @@ -138,8 +139,8 @@ Polymer({
|
| this.lastSearchQuery_ = urlSearchQuery;
|
|
|
| var toolbar = /** @type {!CrToolbarElement} */ (this.$$('cr-toolbar'));
|
| - var searchField = /** @type {CrToolbarSearchFieldElement} */ (
|
| - toolbar.getSearchField());
|
| + var searchField =
|
| + /** @type {CrToolbarSearchFieldElement} */ (toolbar.getSearchField());
|
|
|
| // If the search was initiated by directly entering a search URL, need to
|
| // sync the URL parameter to the textbox.
|
| @@ -157,8 +158,8 @@ Polymer({
|
| * @private
|
| */
|
| onRefreshPref_: function(e) {
|
| - var prefName = /** @type {string} */(e.detail);
|
| - return /** @type {SettingsPrefsElement} */(this.$.prefs).refresh(prefName);
|
| + var prefName = /** @type {string} */ (e.detail);
|
| + return /** @type {SettingsPrefsElement} */ (this.$.prefs).refresh(prefName);
|
| },
|
|
|
| /**
|
| @@ -197,7 +198,6 @@ Polymer({
|
|
|
| /** @private */
|
| directionDelegateChanged_: function() {
|
| - this.$.drawer.align = this.directionDelegate.isRtl() ?
|
| - 'right' : 'left';
|
| + this.$.drawer.align = this.directionDelegate.isRtl() ? 'right' : 'left';
|
| },
|
| });
|
|
|