Clang format JS: Disallow single line functions, conditionals, loops, and switch statements

This is to more easily set breakpoints.

R=dschuyler@chromium.org
BUG=567770
NOPRESUBMIT=true  # ugh, those __getters__
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2603443002
Cr-Commit-Position: refs/heads/master@{#440558}
diff --git a/chrome/browser/resources/.clang-format b/chrome/browser/resources/.clang-format
index 4d25b73..8fd4c4a 100644
--- a/chrome/browser/resources/.clang-format
+++ b/chrome/browser/resources/.clang-format
@@ -6,7 +6,7 @@
 
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 SpacesInContainerLiterals: false
diff --git a/ui/webui/resources/.clang-format b/ui/webui/resources/.clang-format
index d27bf2e..8fd4c4a 100644
--- a/ui/webui/resources/.clang-format
+++ b/ui/webui/resources/.clang-format
@@ -3,3 +3,11 @@
 # Renaming quotes in <include> and <if> break things.
 # For normal JS code, please prefer ' to ".
 JavaScriptQuotes: Leave
+
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+SpacesInContainerLiterals: false
+SpacesInSquareBrackets: false
diff --git a/ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.js b/ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.js
index 7b912fa..ba7728b 100644
--- a/ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.js
+++ b/ui/webui/resources/cr_elements/cr_action_menu/cr_action_menu.js
@@ -41,7 +41,9 @@
   },
 
   /** override */
-  detached: function() { this.removeResizeListener_(); },
+  detached: function() {
+    this.removeResizeListener_();
+  },
 
   /** @private */
   removeResizeListener_: function() {
diff --git a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js
index 0114ebd..d15ed9b 100644
--- a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js
+++ b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js
@@ -55,5 +55,7 @@
   },
 
   /** @return {!PaperIconButtonElement} */
-  getCloseButton: function() { return this.$.close; },
+  getCloseButton: function() {
+    return this.$.close;
+  },
 });
diff --git a/ui/webui/resources/cr_elements/cr_expand_button/cr_expand_button.js b/ui/webui/resources/cr_elements/cr_expand_button/cr_expand_button.js
index 1a4d7b7..27d57d37 100644
--- a/ui/webui/resources/cr_elements/cr_expand_button/cr_expand_button.js
+++ b/ui/webui/resources/cr_elements/cr_expand_button/cr_expand_button.js
@@ -38,5 +38,7 @@
    * @param {Event} event
    * @private
    */
-  stopTap_: function(event) { event.stopPropagation(); },
+  stopTap_: function(event) {
+    event.stopPropagation();
+  },
 });
diff --git a/ui/webui/resources/cr_elements/cr_lazy_render/cr_lazy_render.js b/ui/webui/resources/cr_elements/cr_lazy_render/cr_lazy_render.js
index 47ed5bed..8fac4f4 100644
--- a/ui/webui/resources/cr_elements/cr_lazy_render/cr_lazy_render.js
+++ b/ui/webui/resources/cr_elements/cr_lazy_render/cr_lazy_render.js
@@ -37,7 +37,9 @@
    * @return {?Element} The element contained in the template, if it has
    *   already been stamped.
    */
-  getIfExists: function() { return this.child_; },
+  getIfExists: function() {
+    return this.child_;
+  },
 
   /** @private */
   render_: function() {
diff --git a/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.js b/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.js
index df8421e..d59203c 100644
--- a/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.js
+++ b/ui/webui/resources/cr_elements/cr_profile_avatar_selector/cr_profile_avatar_selector.js
@@ -18,7 +18,12 @@
      * The list of profile avatar URLs and labels.
      * @type {!Array<!AvatarIcon>}
      */
-    avatars: {type: Array, value: function() { return []; }},
+    avatars: {
+      type: Array,
+      value: function() {
+        return [];
+      }
+    },
 
     /**
      * The currently selected profile avatar URL. May be a data URI.
@@ -37,5 +42,7 @@
    * @return {string} A CSS imageset for multiple scale factors.
    * @private
    */
-  getIconImageset_: function(iconUrl) { return cr.icon.getImage(iconUrl); },
+  getIconImageset_: function(iconUrl) {
+    return cr.icon.getImage(iconUrl);
+  },
 });
diff --git a/ui/webui/resources/cr_elements/cr_search_field/cr_search_field_behavior.js b/ui/webui/resources/cr_elements/cr_search_field/cr_search_field_behavior.js
index 8729c86..68c15d4f 100644
--- a/ui/webui/resources/cr_elements/cr_search_field/cr_search_field_behavior.js
+++ b/ui/webui/resources/cr_elements/cr_search_field/cr_search_field_behavior.js
@@ -36,7 +36,9 @@
   /**
    * @return {string} The value of the search field.
    */
-  getValue: function() { return this.getSearchInput().value; },
+  getValue: function() {
+    return this.getSearchInput().value;
+  },
 
   /**
    * Sets the value of the search field.
diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js
index 10986a9..09ddc81 100644
--- a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js
+++ b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js
@@ -52,13 +52,19 @@
   ],
 
   /** @return {!CrToolbarSearchFieldElement} */
-  getSearchField: function() { return this.$.search; },
+  getSearchField: function() {
+    return this.$.search;
+  },
 
   /** @private */
-  onClosePromoTap_: function() { this.fire('cr-toolbar-menu-promo-close'); },
+  onClosePromoTap_: function() {
+    this.fire('cr-toolbar-menu-promo-close');
+  },
 
   /** @private */
-  onMenuTap_: function() { this.fire('cr-toolbar-menu-tap'); },
+  onMenuTap_: function() {
+    this.fire('cr-toolbar-menu-tap');
+  },
 
   /** @private */
   possiblyShowMenuPromo_: function() {
diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js
index 916d7d5..3de204c 100644
--- a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js
+++ b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js
@@ -50,7 +50,9 @@
   },
 
   /** @return {!HTMLInputElement} */
-  getSearchInput: function() { return this.$.searchInput; },
+  getSearchInput: function() {
+    return this.$.searchInput;
+  },
 
   /**
    * Sets the value of the search field. Overridden from CrSearchFieldBehavior.
@@ -64,7 +66,9 @@
   },
 
   /** @return {boolean} */
-  isSearchFocused: function() { return this.searchFocused_; },
+  isSearchFocused: function() {
+    return this.searchFocused_;
+  },
 
   showAndFocus: function() {
     this.showingSearch = true;
@@ -72,14 +76,18 @@
   },
 
   /** @private */
-  focus_: function() { this.getSearchInput().focus(); },
+  focus_: function() {
+    this.getSearchInput().focus();
+  },
 
   /**
    * @param {boolean} narrow
    * @return {number}
    * @private
    */
-  computeIconTabIndex_: function(narrow) { return narrow ? 0 : -1; },
+  computeIconTabIndex_: function(narrow) {
+    return narrow ? 0 : -1;
+  },
 
   /**
    * @return {boolean}
@@ -90,7 +98,9 @@
   },
 
   /** @private */
-  onInputFocus_: function() { this.searchFocused_ = true; },
+  onInputFocus_: function() {
+    this.searchFocused_ = true;
+  },
 
   /** @private */
   onInputBlur_: function() {
diff --git a/ui/webui/resources/cr_elements/network/cr_network_list.js b/ui/webui/resources/cr_elements/network/cr_network_list.js
index 595ea7b..e1ded9a 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_list.js
+++ b/ui/webui/resources/cr_elements/network/cr_network_list.js
@@ -26,13 +26,23 @@
      * The list of network state properties for the items to display.
      * @type {!Array<!CrOnc.NetworkStateProperties>}
      */
-    networks: {type: Array, value: function() { return []; }},
+    networks: {
+      type: Array,
+      value: function() {
+        return [];
+      }
+    },
 
     /**
      * The list of custom items to display after the list of networks.
      * @type {!Array<!CrNetworkList.CustomItemState>}
      */
-    customItems: {type: Array, value: function() { return []; }},
+    customItems: {
+      type: Array,
+      value: function() {
+        return [];
+      }
+    },
 
     /** True if action buttons should be shown for the itmes. */
     showButtons: {
@@ -68,7 +78,9 @@
   },
 
   /** @private */
-  listChanged_: function() { this.updateScrollableContents(); },
+  listChanged_: function() {
+    this.updateScrollableContents();
+  },
 
   /**
    * Returns a combined list of networks and custom items.
diff --git a/ui/webui/resources/cr_elements/network/cr_network_list_item.js b/ui/webui/resources/cr_elements/network/cr_network_list_item.js
index 37b63313..4ec8666 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_list_item.js
+++ b/ui/webui/resources/cr_elements/network/cr_network_list_item.js
@@ -101,7 +101,9 @@
   },
 
   /** @private */
-  isStateTextConnected_() { return this.isListItem && this.isConnected_(); },
+  isStateTextConnected_() {
+    return this.isListItem && this.isConnected_();
+  },
 
   /**
    * This only gets called for network items once networkState is set.
diff --git a/ui/webui/resources/cr_elements/network/cr_network_select.js b/ui/webui/resources/cr_elements/network/cr_network_select.js
index 30e67e8..de4cdef 100644
--- a/ui/webui/resources/cr_elements/network/cr_network_select.js
+++ b/ui/webui/resources/cr_elements/network/cr_network_select.js
@@ -76,7 +76,12 @@
      * List of all network state data for all visible networks.
      * @type {!Array<!CrOnc.NetworkStateProperties>}
      */
-    networkStateList: {type: Array, value: function() { return []; }},
+    networkStateList: {
+      type: Array,
+      value: function() {
+        return [];
+      }
+    },
 
     /**
      * The list of custom items to display after the list of networks.
@@ -85,7 +90,9 @@
      */
     customItems: {
       type: Array,
-      value: function() { return []; },
+      value: function() {
+        return [];
+      },
     },
 
     /**
diff --git a/ui/webui/resources/js/action_link.js b/ui/webui/resources/js/action_link.js
index 4cfcc95..a9e1ffd6 100644
--- a/ui/webui/resources/js/action_link.js
+++ b/ui/webui/resources/js/action_link.js
@@ -54,7 +54,9 @@
         }
       });
 
-      function preventDefault(e) { e.preventDefault(); }
+      function preventDefault(e) {
+        e.preventDefault();
+      }
 
       function removePreventDefault() {
         document.removeEventListener('selectstart', preventDefault);
@@ -73,8 +75,9 @@
           this.classList.add('no-outline');
       });
 
-      this.addEventListener(
-          'blur', function() { this.classList.remove('no-outline'); });
+      this.addEventListener('blur', function() {
+        this.classList.remove('no-outline');
+      });
     },
 
     /** @type {boolean} */
@@ -85,7 +88,9 @@
         HTMLAnchorElement.prototype.removeAttribute.call(this, 'disabled');
       this.tabIndex = disabled ? -1 : 0;
     },
-    get disabled() { return this.hasAttribute('disabled'); },
+    get disabled() {
+      return this.hasAttribute('disabled');
+    },
 
     /** @override */
     setAttribute: function(attr, val) {
diff --git a/ui/webui/resources/js/assert.js b/ui/webui/resources/js/assert.js
index a404b68..42fb523 100644
--- a/ui/webui/resources/js/assert.js
+++ b/ui/webui/resources/js/assert.js
@@ -21,7 +21,9 @@
     if (opt_message)
       message = message + ': ' + opt_message;
     var error = new Error(message);
-    var global = function() { return this; }();
+    var global = function() {
+      return this;
+    }();
     if (global.traceAssertionsForTesting)
       console.warn(error.stack);
     throw error;
diff --git a/ui/webui/resources/js/chromeos/ui_account_tweaks.js b/ui/webui/resources/js/chromeos/ui_account_tweaks.js
index 278af2eb..1aa9123 100644
--- a/ui/webui/resources/js/chromeos/ui_account_tweaks.js
+++ b/ui/webui/resources/js/chromeos/ui_account_tweaks.js
@@ -166,7 +166,9 @@
         element.nodeName == 'BUTTON') {
       element.disabled = true;
     } else if (element.nodeName == 'A') {
-      element.onclick = function() { return false; };
+      element.onclick = function() {
+        return false;
+      };
     }
   };
 
diff --git a/ui/webui/resources/js/cr.js b/ui/webui/resources/js/cr.js
index 14bccfb..c185695 100644
--- a/ui/webui/resources/js/cr.js
+++ b/ui/webui/resources/js/cr.js
@@ -109,13 +109,19 @@
     switch (kind) {
       case PropertyKind.JS:
         var privateName = name + '_';
-        return function() { return this[privateName]; };
+        return function() {
+          return this[privateName];
+        };
       case PropertyKind.ATTR:
         var attributeName = getAttributeName(name);
-        return function() { return this.getAttribute(attributeName); };
+        return function() {
+          return this.getAttribute(attributeName);
+        };
       case PropertyKind.BOOL_ATTR:
         var attributeName = getAttributeName(name);
-        return function() { return this.hasAttribute(attributeName); };
+        return function() {
+          return this.hasAttribute(attributeName);
+        };
     }
 
     // TODO(dbeam): replace with assertNotReached() in assert.js when I can coax
@@ -214,7 +220,9 @@
   /**
    * @return {number} A new unique ID.
    */
-  function createUid() { return uidCounter++; }
+  function createUid() {
+    return uidCounter++;
+  }
 
   /**
    * Returns a unique ID for the item. This mutates the item so it needs to be
@@ -440,24 +448,38 @@
     webUIListenerCallback: webUIListenerCallback,
     webUIResponse: webUIResponse,
 
-    get doc() { return document; },
+    get doc() {
+      return document;
+    },
 
     /** Whether we are using a Mac or not. */
-    get isMac() { return /Mac/.test(navigator.platform); },
+    get isMac() {
+      return /Mac/.test(navigator.platform);
+    },
 
     /** Whether this is on the Windows platform or not. */
-    get isWindows() { return /Win/.test(navigator.platform); },
+    get isWindows() {
+      return /Win/.test(navigator.platform);
+    },
 
     /** Whether this is on chromeOS or not. */
-    get isChromeOS() { return /CrOS/.test(navigator.userAgent); },
+    get isChromeOS() {
+      return /CrOS/.test(navigator.userAgent);
+    },
 
     /** Whether this is on vanilla Linux (not chromeOS). */
-    get isLinux() { return /Linux/.test(navigator.userAgent); },
+    get isLinux() {
+      return /Linux/.test(navigator.userAgent);
+    },
 
     /** Whether this is on Android. */
-    get isAndroid() { return /Android/.test(navigator.userAgent); },
+    get isAndroid() {
+      return /Android/.test(navigator.userAgent);
+    },
 
     /** Whether this is on iOS. */
-    get isIOS() { return /iPad|iPhone|iPod/.test(navigator.platform); }
+    get isIOS() {
+      return /iPad|iPhone|iPod/.test(navigator.platform);
+    }
   };
 }();
diff --git a/ui/webui/resources/js/cr/event_target.js b/ui/webui/resources/js/cr/event_target.js
index c9e09140..24cdf294 100644
--- a/ui/webui/resources/js/cr/event_target.js
+++ b/ui/webui/resources/js/cr/event_target.js
@@ -76,7 +76,9 @@
       // Since we are using DOM Event objects we need to override some of the
       // properties and methods so that we can emulate this correctly.
       var self = this;
-      event.__defineGetter__('target', function() { return self; });
+      event.__defineGetter__('target', function() {
+        return self;
+      });
 
       var type = event.type;
       var prevented = 0;
diff --git a/ui/webui/resources/js/cr/link_controller.js b/ui/webui/resources/js/cr/link_controller.js
index 589f6aa..67515e8 100644
--- a/ui/webui/resources/js/cr/link_controller.js
+++ b/ui/webui/resources/js/cr/link_controller.js
@@ -46,7 +46,9 @@
    *     links.
    * @constructor
    */
-  function LinkController(localStrings) { this.localStrings_ = localStrings; }
+  function LinkController(localStrings) {
+    this.localStrings_ = localStrings;
+  }
 
   LinkController.prototype = {
     /**
@@ -99,7 +101,9 @@
      * @param {string} url The URL to open.
      * @param {cr.LinkKind} kind The kind of open we want to do.
      */
-    openUrl: function(url, kind) { this.openUrls([url], kind); },
+    openUrl: function(url, kind) {
+      this.openUrls([url], kind);
+    },
 
     /**
      * Opens URLs in new tab, window or incognito mode.
@@ -118,8 +122,9 @@
       // Fix '#124' URLs since opening those in a new window does not work. We
       // prepend the base URL when we encounter those.
       var base = this.window.location.href.split('#')[0];
-      urls =
-          urls.map(function(url) { return url[0] == '#' ? base + url : url; });
+      urls = urls.map(function(url) {
+        return url[0] == '#' ? base + url : url;
+      });
 
       var incognito = kind == cr.LinkKind.INCOGNITO;
       if (kind == cr.LinkKind.WINDOW || incognito) {
diff --git a/ui/webui/resources/js/cr/ui/array_data_model.js b/ui/webui/resources/js/cr/ui/array_data_model.js
index 5138cef..d63fbb6 100644
--- a/ui/webui/resources/js/cr/ui/array_data_model.js
+++ b/ui/webui/resources/js/cr/ui/array_data_model.js
@@ -41,7 +41,9 @@
      * The length of the data model.
      * @type {number}
      */
-    get length() { return this.array_.length; },
+    get length() {
+      return this.array_.length;
+    },
 
     /**
      * Returns the item at the given index.
@@ -61,7 +63,9 @@
      * @param {string} field The field to get compare function for.
      * @return {function(*, *): number} Compare function set for given field.
      */
-    compareFunction: function(field) { return this.compareFunctions_[field]; },
+    compareFunction: function(field) {
+      return this.compareFunctions_[field];
+    },
 
     /**
      * Sets compare function for given field.
@@ -243,7 +247,9 @@
      * This runs sort after updating.
      * @param {number} index The index of the item to update.
      */
-    updateIndex: function(index) { this.updateIndexes([index]); },
+    updateIndex: function(index) {
+      this.updateIndexes([index]);
+    },
 
     /**
      * Notifies of update of the items in the array. This does not remove and
@@ -294,7 +300,9 @@
      * @param {function()} callback The function to invoke when preparation
      *     is complete.
      */
-    prepareSort: function(field, callback) { callback(); },
+    prepareSort: function(field, callback) {
+      callback();
+    },
 
     /**
      * Sorts data model according to given field and direction and dispathes
diff --git a/ui/webui/resources/js/cr/ui/autocomplete_list.js b/ui/webui/resources/js/cr/ui/autocomplete_list.js
index 0c140cb..ccd9400 100644
--- a/ui/webui/resources/js/cr/ui/autocomplete_list.js
+++ b/ui/webui/resources/js/cr/ui/autocomplete_list.js
@@ -133,7 +133,9 @@
      * By default, clears and hides the autocomplete popup. Note that the
      * keydown event bubbles up, so the input field can handle the event.
      */
-    handleEnterKeydown: function() { this.suggestions = []; },
+    handleEnterKeydown: function() {
+      this.suggestions = [];
+    },
 
     /**
      * Handles the selected suggestion. Called when a suggestion is selected.
@@ -222,7 +224,9 @@
      * @return {HTMLElement} The text field the autocomplete popup is currently
      *     attached to, if any.
      */
-    get targetInput() { return this.targetInput_; },
+    get targetInput() {
+      return this.targetInput_;
+    },
 
     /**
      * Handles input field key events that should be interpreted as autocomplete
diff --git a/ui/webui/resources/js/cr/ui/bubble.js b/ui/webui/resources/js/cr/ui/bubble.js
index a2cc09d..fe97030 100644
--- a/ui/webui/resources/js/cr/ui/bubble.js
+++ b/ui/webui/resources/js/cr/ui/bubble.js
@@ -291,7 +291,9 @@
      * Attach the bubble to the document's DOM.
      * @private
      */
-    attachToDOM_: function() { document.body.appendChild(this); },
+    attachToDOM_: function() {
+      document.body.appendChild(this);
+    },
 
     /**
      * Update the arrow so that it appears at the correct position.
diff --git a/ui/webui/resources/js/cr/ui/card_slider.js b/ui/webui/resources/js/cr/ui/card_slider.js
index 4de3934..1dc2740 100644
--- a/ui/webui/resources/js/cr/ui/card_slider.js
+++ b/ui/webui/resources/js/cr/ui/card_slider.js
@@ -228,32 +228,42 @@
      * Returns the index of the current card.
      * @return {number} index of the current card.
      */
-    get currentCard() { return this.currentCard_; },
+    get currentCard() {
+      return this.currentCard_;
+    },
 
     /**
      * Allows setting the current card index.
      * @param {number} index A new index to set the current index to.
      * @return {number} The new index after having been set.
      */
-    set currentCard(index) { return (this.currentCard_ = index); },
+    set currentCard(index) {
+      return (this.currentCard_ = index);
+    },
 
     /**
      * Returns the number of cards.
      * @return {number} number of cards.
      */
-    get cardCount() { return this.cards_.length; },
+    get cardCount() {
+      return this.cards_.length;
+    },
 
     /**
      * Returns the current card itself.
      * @return {!Element} the currently shown card.
      */
-    get currentCardValue() { return this.cards_[this.currentCard_]; },
+    get currentCardValue() {
+      return this.cards_[this.currentCard_];
+    },
 
     /**
      * Returns the frame holding the cards.
      * @return {Element} The frame used to position the cards.
      */
-    get frame() { return this.frame_; },
+    get frame() {
+      return this.frame_;
+    },
 
     /**
      * Handle horizontal scrolls to flip between pages.
@@ -458,7 +468,9 @@
      * the likely event it needs to be updated by a card being inserted or
      * removed in the flow.
      */
-    repositionFrame: function() { this.transformToCurrentCard_(); },
+    repositionFrame: function() {
+      this.transformToCurrentCard_();
+    },
 
     /**
      * Checks the the given |index| exists in this.cards_.
diff --git a/ui/webui/resources/js/cr/ui/command.js b/ui/webui/resources/js/cr/ui/command.js
index 3f857aff..783bba5 100644
--- a/ui/webui/resources/js/cr/ui/command.js
+++ b/ui/webui/resources/js/cr/ui/command.js
@@ -129,7 +129,9 @@
      * @type {string}
      */
     shortcut_: '',
-    get shortcut() { return this.shortcut_; },
+    get shortcut() {
+      return this.shortcut_;
+    },
     set shortcut(shortcut) {
       var oldShortcut = this.shortcut_;
       if (shortcut !== oldShortcut) {
@@ -310,7 +312,9 @@
      * @type {boolean}
      */
     canExecute_: false,
-    get canExecute() { return this.canExecute_; },
+    get canExecute() {
+      return this.canExecute_;
+    },
     set canExecute(canExecute) {
       this.canExecute_ = !!canExecute;
       this.stopPropagation();
diff --git a/ui/webui/resources/js/cr/ui/context_menu_handler.js b/ui/webui/resources/js/cr/ui/context_menu_handler.js
index 2266801..8e0ccff 100644
--- a/ui/webui/resources/js/cr/ui/context_menu_handler.js
+++ b/ui/webui/resources/js/cr/ui/context_menu_handler.js
@@ -14,7 +14,9 @@
    * @extends {cr.EventTarget}
    * @implements {EventListener}
    */
-  function ContextMenuHandler() { this.showingEvents_ = new EventTracker(); }
+  function ContextMenuHandler() {
+    this.showingEvents_ = new EventTracker();
+  }
 
   ContextMenuHandler.prototype = {
     __proto__: EventTarget.prototype,
@@ -23,7 +25,10 @@
      * The menu that we are currently showing.
      * @type {cr.ui.Menu}
      */
-    menu_: null, get menu() { return this.menu_; },
+    menu_: null,
+    get menu() {
+      return this.menu_;
+    },
 
     /**
      * Shows a menu as a context menu.
@@ -217,8 +222,9 @@
           elementOrClass.prototype :
           elementOrClass;
 
-      target.__defineGetter__(
-          'contextMenu', function() { return this.contextMenu_; });
+      target.__defineGetter__('contextMenu', function() {
+        return this.contextMenu_;
+      });
       target.__defineSetter__('contextMenu', function(menu) {
         var oldContextMenu = this.contextMenu;
 
diff --git a/ui/webui/resources/js/cr/ui/controlled_indicator.js b/ui/webui/resources/js/cr/ui/controlled_indicator.js
index 249c90a..a30d225 100644
--- a/ui/webui/resources/js/cr/ui/controlled_indicator.js
+++ b/ui/webui/resources/js/cr/ui/controlled_indicator.js
@@ -63,7 +63,9 @@
      * implementation does not set any strings.
      * @return {Object}
      */
-    getDefaultStrings: function() { return {}; },
+    getDefaultStrings: function() {
+      return {};
+    },
 
     /**
      * Returns the text shown in the bubble.
diff --git a/ui/webui/resources/js/cr/ui/dialogs.js b/ui/webui/resources/js/cr/ui/dialogs.js
index 4ec7ed4..96693e0 100644
--- a/ui/webui/resources/js/cr/ui/dialogs.js
+++ b/ui/webui/resources/js/cr/ui/dialogs.js
@@ -171,8 +171,10 @@
 
   /** @private */
   BaseDialog.prototype.findFocusableElements_ = function(doc) {
-    var elements = Array.prototype.filter.call(
-        doc.querySelectorAll('*'), function(n) { return n.tabIndex >= 0; });
+    var elements =
+        Array.prototype.filter.call(doc.querySelectorAll('*'), function(n) {
+          return n.tabIndex >= 0;
+        });
 
     var iframes = doc.querySelectorAll('iframe');
     for (var i = 0; i < iframes.length; i++) {
@@ -217,7 +219,9 @@
     this.tabIndexes_ = this.deactivatedNodes_.map(function(n) {
       return n.getAttribute('tabindex');
     });
-    this.deactivatedNodes_.forEach(function(n) { n.tabIndex = -1; });
+    this.deactivatedNodes_.forEach(function(n) {
+      n.tabIndex = -1;
+    });
 
     this.previousActiveElement_ = this.document_.activeElement;
     this.parentNode_.appendChild(this.container_);
@@ -306,7 +310,9 @@
    * @constructor
    * @extends {cr.ui.dialogs.BaseDialog}
    */
-  function ConfirmDialog(parentNode) { BaseDialog.call(this, parentNode); }
+  function ConfirmDialog(parentNode) {
+    BaseDialog.call(this, parentNode);
+  }
 
   ConfirmDialog.prototype = {__proto__: BaseDialog.prototype};
 
@@ -357,7 +363,9 @@
         this, message, opt_onOk, opt_onCancel, opt_onShow);
   };
 
-  PromptDialog.prototype.getValue = function() { return this.input_.value; };
+  PromptDialog.prototype.getValue = function() {
+    return this.input_.value;
+  };
 
   /** @private */
   PromptDialog.prototype.onOkClick_ = function(event) {
diff --git a/ui/webui/resources/js/cr/ui/drag_wrapper.js b/ui/webui/resources/js/cr/ui/drag_wrapper.js
index 60d7cef..005814a9 100644
--- a/ui/webui/resources/js/cr/ui/drag_wrapper.js
+++ b/ui/webui/resources/js/cr/ui/drag_wrapper.js
@@ -41,7 +41,9 @@
    * @param {!cr.ui.DragWrapperDelegate} delegate
    * @constructor
    */
-  function DragWrapper(target, delegate) { this.initialize(target, delegate); }
+  function DragWrapper(target, delegate) {
+    this.initialize(target, delegate);
+  }
 
   DragWrapper.prototype = {
     initialize: function(target, delegate) {
diff --git a/ui/webui/resources/js/cr/ui/expandable_bubble.js b/ui/webui/resources/js/cr/ui/expandable_bubble.js
index 16a7635..8844079 100644
--- a/ui/webui/resources/js/cr/ui/expandable_bubble.js
+++ b/ui/webui/resources/js/cr/ui/expandable_bubble.js
@@ -75,7 +75,9 @@
      * is clicked. By default is set to this.hide.
      * @param {Function} func A function with no parameters.
      */
-    set handleCloseEvent(func) { this.handleCloseEvent_ = func; },
+    set handleCloseEvent(func) {
+      this.handleCloseEvent_ = func;
+    },
 
     /**
      * Temporarily suppresses the bubble from view (and toggles it back).
diff --git a/ui/webui/resources/js/cr/ui/focus_grid.js b/ui/webui/resources/js/cr/ui/focus_grid.js
index e2dc5ad..40c782e 100644
--- a/ui/webui/resources/js/cr/ui/focus_grid.js
+++ b/ui/webui/resources/js/cr/ui/focus_grid.js
@@ -43,7 +43,9 @@
       else
         this.lastFocused_ = e.currentTarget;
 
-      this.rows.forEach(function(r) { r.makeActive(r == row); });
+      this.rows.forEach(function(r) {
+        r.makeActive(r == row);
+      });
     },
 
     /** @override */
@@ -77,7 +79,9 @@
      * Unregisters event handlers and removes all |this.rows|.
      */
     destroy: function() {
-      this.rows.forEach(function(row) { row.destroy(); });
+      this.rows.forEach(function(row) {
+        row.destroy();
+      });
       this.rows.length = 0;
     },
 
@@ -109,7 +113,9 @@
      * Adds |row| to the end of this list.
      * @param {!cr.ui.FocusRow} row The row that needs to be added to this grid.
      */
-    addRow: function(row) { this.addRowBefore(row, null); },
+    addRow: function(row) {
+      this.addRowBefore(row, null);
+    },
 
     /**
      * Adds |row| before |nextRow|. If |nextRow| is not in the list or it's
diff --git a/ui/webui/resources/js/cr/ui/focus_manager.js b/ui/webui/resources/js/cr/ui/focus_manager.js
index 8fb528d..e2c8347d 100644
--- a/ui/webui/resources/js/cr/ui/focus_manager.js
+++ b/ui/webui/resources/js/cr/ui/focus_manager.js
@@ -36,7 +36,9 @@
      * allowed to receive focus.
      * @return {Element} The element containing focusable elements.
      */
-    getFocusParent: function() { return document.body; },
+    getFocusParent: function() {
+      return document.body;
+    },
 
     /**
      * Returns the elements on the page capable of receiving focus.
diff --git a/ui/webui/resources/js/cr/ui/focus_outline_manager.js b/ui/webui/resources/js/cr/ui/focus_outline_manager.js
index 8ca4f92..23ef152 100644
--- a/ui/webui/resources/js/cr/ui/focus_outline_manager.js
+++ b/ui/webui/resources/js/cr/ui/focus_outline_manager.js
@@ -31,11 +31,13 @@
 
     var self = this;
 
-    doc.addEventListener(
-        'keydown', function(e) { self.focusByKeyboard_ = true; }, true);
+    doc.addEventListener('keydown', function(e) {
+      self.focusByKeyboard_ = true;
+    }, true);
 
-    doc.addEventListener(
-        'mousedown', function(e) { self.focusByKeyboard_ = false; }, true);
+    doc.addEventListener('mousedown', function(e) {
+      self.focusByKeyboard_ = false;
+    }, true);
 
     doc.addEventListener('focus', function(event) {
       // Update visibility only when focus is actually changed.
@@ -62,14 +64,20 @@
      */
     focusByKeyboard_: true,
 
-    updateVisibility: function() { this.visible = this.focusByKeyboard_; },
+    updateVisibility: function() {
+      this.visible = this.focusByKeyboard_;
+    },
 
     /**
      * Whether the focus outline should be visible.
      * @type {boolean}
      */
-    set visible(visible) { this.classList_.toggle(CLASS_NAME, visible); },
-    get visible() { return this.classList_.contains(CLASS_NAME); }
+    set visible(visible) {
+      this.classList_.toggle(CLASS_NAME, visible);
+    },
+    get visible() {
+      return this.classList_.contains(CLASS_NAME);
+    }
   };
 
   /**
diff --git a/ui/webui/resources/js/cr/ui/focus_row.js b/ui/webui/resources/js/cr/ui/focus_row.js
index 36b5865..652b0353 100644
--- a/ui/webui/resources/js/cr/ui/focus_row.js
+++ b/ui/webui/resources/js/cr/ui/focus_row.js
@@ -126,7 +126,9 @@
     },
 
     /** Dereferences nodes and removes event handlers. */
-    destroy: function() { this.eventTracker.removeAll(); },
+    destroy: function() {
+      this.eventTracker.removeAll();
+    },
 
     /**
      * @param {!Element} sampleElement An element for to find an equivalent for.
diff --git a/ui/webui/resources/js/cr/ui/grid.js b/ui/webui/resources/js/cr/ui/grid.js
index aa0b9288..a71bf6b 100644
--- a/ui/webui/resources/js/cr/ui/grid.js
+++ b/ui/webui/resources/js/cr/ui/grid.js
@@ -73,7 +73,9 @@
      * Shows a warning at the setter because cr.ui.Grid does not support this.
      * @type {boolean}
      */
-    get fixedHeight() { return true; },
+    get fixedHeight() {
+      return true;
+    },
     set fixedHeight(fixedHeight) {
       if (!fixedHeight)
         console.warn('cr.ui.Grid does not support fixedHeight = false');
@@ -206,14 +208,18 @@
      *     of multiple columns.
      * @override
      */
-    getItemRow: function(index) { return Math.floor(index / this.columns); },
+    getItemRow: function(index) {
+      return Math.floor(index / this.columns);
+    },
 
     /**
      * @param {number} row The row.
      * @return {number} The index of the first item in the row.
      * @override
      */
-    getFirstItemInRow: function(row) { return row * this.columns; },
+    getFirstItemInRow: function(row) {
+      return row * this.columns;
+    },
 
     /**
      * Creates the selection controller to use internally.
@@ -404,7 +410,9 @@
      * @return {number} The index before or -1 if not found.
      * @override
      */
-    getIndexBefore: function(index) { return index - 1; },
+    getIndexBefore: function(index) {
+      return index - 1;
+    },
 
     /**
      * Returns the index after (x axis) the given element.
diff --git a/ui/webui/resources/js/cr/ui/list.js b/ui/webui/resources/js/cr/ui/list.js
index a5a0b99..99196c6 100644
--- a/ui/webui/resources/js/cr/ui/list.js
+++ b/ui/webui/resources/js/cr/ui/list.js
@@ -94,7 +94,9 @@
      * Function used to create grid items.
      * @return {function(new:cr.ui.ListItem, *)}
      */
-    get itemConstructor() { return this.itemConstructor_; },
+    get itemConstructor() {
+      return this.itemConstructor_;
+    },
     set itemConstructor(func) {
       if (func != this.itemConstructor_) {
         this.itemConstructor_ = func;
@@ -146,7 +148,9 @@
       this.onSetDataModelComplete();
     },
 
-    get dataModel() { return this.dataModel_; },
+    get dataModel() {
+      return this.dataModel_;
+    },
 
     /**
      * Override to be notified when |this.dataModel| is set.
@@ -164,7 +168,9 @@
      * The selection model to use.
      * @type {cr.ui.ListSelectionModel}
      */
-    get selectionModel() { return this.selectionModel_; },
+    get selectionModel() {
+      return this.selectionModel_;
+    },
     set selectionModel(sm) {
       var oldSm = this.selectionModel_;
       if (oldSm == sm)
@@ -194,7 +200,9 @@
      * Whether or not the list auto-expands.
      * @type {boolean}
      */
-    get autoExpands() { return this.autoExpands_; },
+    get autoExpands() {
+      return this.autoExpands_;
+    },
     set autoExpands(autoExpands) {
       if (this.autoExpands_ == autoExpands)
         return;
@@ -206,7 +214,9 @@
      * Whether or not the rows on list have various heights.
      * @type {boolean}
      */
-    get fixedHeight() { return this.fixedHeight_; },
+    get fixedHeight() {
+      return this.fixedHeight_;
+    },
     set fixedHeight(fixedHeight) {
       if (this.fixedHeight_ == fixedHeight)
         return;
@@ -243,7 +253,9 @@
       var indexes = this.selectionModel.selectedIndexes;
       var dataModel = this.dataModel;
       if (dataModel) {
-        return indexes.map(function(i) { return dataModel.item(i); });
+        return indexes.map(function(i) {
+          return dataModel.item(i);
+        });
       }
       return [];
     },
@@ -275,7 +287,9 @@
      * sure that the code will not return without calling endBatchUpdates or the
      * list will not be correctly updated.
      */
-    startBatchUpdates: function() { this.batchCount_++; },
+    startBatchUpdates: function() {
+      this.batchCount_++;
+    },
 
     /**
      * See startBatchUpdates.
@@ -684,13 +698,17 @@
      * @return {number} The row of the item. May vary in the case
      *     of multiple columns.
      */
-    getItemRow: function(index) { return index; },
+    getItemRow: function(index) {
+      return index;
+    },
 
     /**
      * @param {number} row The row.
      * @return {number} The index of the first item in the row.
      */
-    getFirstItemInRow: function(row) { return row; },
+    getFirstItemInRow: function(row) {
+      return row;
+    },
 
     /**
      * Ensures that a given index is inside the viewport.
@@ -713,7 +731,9 @@
 
       var self = this;
       // Function to adjust the tops of viewport and row.
-      function scrollToAdjustTop() { self.scrollTop = top; }
+      function scrollToAdjustTop() {
+        self.scrollTop = top;
+      }
       // Function to adjust the bottoms of viewport and row.
       function scrollToAdjustBottom() {
         self.scrollTop = top + itemHeight - availableHeight;
diff --git a/ui/webui/resources/js/cr/ui/list_item.js b/ui/webui/resources/js/cr/ui/list_item.js
index d86191a9..45ff813 100644
--- a/ui/webui/resources/js/cr/ui/list_item.js
+++ b/ui/webui/resources/js/cr/ui/list_item.js
@@ -25,8 +25,12 @@
      * Plain text label.
      * @type {string}
      */
-    get label() { return this.textContent; },
-    set label(label) { this.textContent = label; },
+    get label() {
+      return this.textContent;
+    },
+    set label(label) {
+      this.textContent = label;
+    },
 
     /**
      * This item's index in the containing list.
@@ -54,8 +58,9 @@
    * selection model. This is only used for display purpose.
    */
   cr.defineProperty(
-      ListItem, 'selected', cr.PropertyKind.BOOL_ATTR,
-      function() { this.selectionChanged(); });
+      ListItem, 'selected', cr.PropertyKind.BOOL_ATTR, function() {
+        this.selectionChanged();
+      });
 
   /**
    * Whether the item is the lead in a selection. Setting this does not update
diff --git a/ui/webui/resources/js/cr/ui/list_selection_controller.js b/ui/webui/resources/js/cr/ui/list_selection_controller.js
index ef925ea4..65525ad 100644
--- a/ui/webui/resources/js/cr/ui/list_selection_controller.js
+++ b/ui/webui/resources/js/cr/ui/list_selection_controller.js
@@ -26,7 +26,9 @@
      * The selection model we are interacting with.
      * @type {cr.ui.ListSelectionModel}
      */
-    get selectionModel() { return this.selectionModel_; },
+    get selectionModel() {
+      return this.selectionModel_;
+    },
 
     /**
      * Returns the index below (y axis) the given element.
@@ -44,7 +46,9 @@
      * @param {number} index The index to get the index above.
      * @return {number} The index below or -1 if not found.
      */
-    getIndexAbove: function(index) { return index - 1; },
+    getIndexAbove: function(index) {
+      return index - 1;
+    },
 
     /**
      * Returns the index before (x axis) the given element. This returns -1
@@ -54,7 +58,9 @@
      * @param {number} index The index to get the index before.
      * @return {number} The index before or -1 if not found.
      */
-    getIndexBefore: function(index) { return -1; },
+    getIndexBefore: function(index) {
+      return -1;
+    },
 
     /**
      * Returns the index after (x axis) the given element. This returns -1
@@ -64,7 +70,9 @@
      * @param {number} index The index to get the index after.
      * @return {number} The index after or -1 if not found.
      */
-    getIndexAfter: function(index) { return -1; },
+    getIndexAfter: function(index) {
+      return -1;
+    },
 
     /**
      * Returns the next list index. This is the next logical and should not
@@ -84,17 +92,23 @@
      * @param {number} index The index to get the previous index for.
      * @return {number} The previous index or -1 if not found.
      */
-    getPreviousIndex: function(index) { return index - 1; },
+    getPreviousIndex: function(index) {
+      return index - 1;
+    },
 
     /**
      * @return {number} The first index.
      */
-    getFirstIndex: function() { return 0; },
+    getFirstIndex: function() {
+      return 0;
+    },
 
     /**
      * @return {number} The last index.
      */
-    getLastIndex: function() { return this.selectionModel.length - 1; },
+    getLastIndex: function() {
+      return this.selectionModel.length - 1;
+    },
 
     /**
      * Called by the view when the user does a mousedown or mouseup on the
diff --git a/ui/webui/resources/js/cr/ui/list_selection_model.js b/ui/webui/resources/js/cr/ui/list_selection_model.js
index 1609e75..a51f2ac9 100644
--- a/ui/webui/resources/js/cr/ui/list_selection_model.js
+++ b/ui/webui/resources/js/cr/ui/list_selection_model.js
@@ -30,7 +30,9 @@
      * The number of items in the model.
      * @type {number}
      */
-    get length() { return this.length_; },
+    get length() {
+      return this.length_;
+    },
 
     /**
      * The selected indexes.
@@ -262,7 +264,9 @@
      * the user is moving using the arrow keys.
      * @type {number}
      */
-    get leadIndex() { return this.leadIndex_; },
+    get leadIndex() {
+      return this.leadIndex_;
+    },
     set leadIndex(leadIndex) {
       var oldValue = this.leadIndex_;
       var newValue = this.adjustIndex_(leadIndex);
@@ -279,7 +283,9 @@
      * The anchorIndex is used with multiple selection.
      * @type {number}
      */
-    get anchorIndex() { return this.anchorIndex_; },
+    get anchorIndex() {
+      return this.anchorIndex_;
+    },
     set anchorIndex(anchorIndex) {
       var oldValue = this.anchorIndex_;
       var newValue = this.adjustIndex_(anchorIndex);
@@ -311,7 +317,9 @@
      * Whether the selection model supports multiple selected items.
      * @type {boolean}
      */
-    get multiple() { return true; },
+    get multiple() {
+      return true;
+    },
 
     /**
      * Adjusts the selection after reordering of items in the table.
@@ -323,10 +331,13 @@
       var oldAnchorIndex = this.anchorIndex;
       var oldSelectedItemsCount = this.selectedIndexes.length;
 
-      this.selectedIndexes =
-          this.selectedIndexes
-              .map(function(oldIndex) { return permutation[oldIndex]; })
-              .filter(function(index) { return index != -1; });
+      this.selectedIndexes = this.selectedIndexes
+                                 .map(function(oldIndex) {
+                                   return permutation[oldIndex];
+                                 })
+                                 .filter(function(index) {
+                                   return index != -1;
+                                 });
 
       // Will be adjusted in endChange.
       if (oldLeadIndex != -1)
@@ -348,7 +359,9 @@
      * Adjusts selection model length.
      * @param {number} length New selection model length.
      */
-    adjustLength: function(length) { this.length_ = length; }
+    adjustLength: function(length) {
+      this.length_ = length;
+    }
   };
 
   return {ListSelectionModel: ListSelectionModel};
diff --git a/ui/webui/resources/js/cr/ui/list_single_selection_model.js b/ui/webui/resources/js/cr/ui/list_single_selection_model.js
index a567649..15865d0 100644
--- a/ui/webui/resources/js/cr/ui/list_single_selection_model.js
+++ b/ui/webui/resources/js/cr/ui/list_single_selection_model.js
@@ -29,7 +29,9 @@
      * The number of items in the model.
      * @type {number}
      */
-    get length() { return this.length_; },
+    get length() {
+      return this.length_;
+    },
 
     /**
      * @type {!Array} The selected indexes.
@@ -47,7 +49,9 @@
      * Setter also changes lead and anchor indexes if value is nonegative.
      * @type {number}
      */
-    get selectedIndex() { return this.selectedIndex_; },
+    get selectedIndex() {
+      return this.selectedIndex_;
+    },
     set selectedIndex(selectedIndex) {
       var oldSelectedIndex = this.selectedIndex;
       var i = Math.max(-1, Math.min(this.length_ - 1, selectedIndex));
@@ -91,7 +95,9 @@
     /**
      * Unselects all selected items.
      */
-    unselectAll: function() { this.selectedIndex = -1; },
+    unselectAll: function() {
+      this.selectedIndex = -1;
+    },
 
     /**
      * Sets the selected state for an index.
@@ -115,7 +121,9 @@
      * @param {number} index The index to check.
      * @return {boolean} Whether an index is selected.
      */
-    getIndexSelected: function(index) { return index == this.selectedIndex_; },
+    getIndexSelected: function(index) {
+      return index == this.selectedIndex_;
+    },
 
     /**
      * This is used to begin batching changes. Call {@code endChange} when you
@@ -154,7 +162,10 @@
       var e = new Event(eventName);
       var indexes = [this.selectedIndexBefore_, this.selectedIndex_];
       e.changes =
-          indexes.filter(function(index) { return index != -1; })
+          indexes
+              .filter(function(index) {
+                return index != -1;
+              })
               .map(function(index) {
                 return {index: index, selected: index == this.selectedIndex_};
               }, this);
@@ -169,7 +180,9 @@
      * the user is moving using the arrow keys.
      * @type {number}
      */
-    get leadIndex() { return this.leadIndex_; },
+    get leadIndex() {
+      return this.leadIndex_;
+    },
     set leadIndex(leadIndex) {
       var li = this.adjustIndex_(leadIndex);
       if (li != this.leadIndex_) {
@@ -191,14 +204,20 @@
      * The anchorIndex is used with multiple selection.
      * @type {number}
      */
-    get anchorIndex() { return this.leadIndex; },
-    set anchorIndex(anchorIndex) { this.leadIndex = anchorIndex; },
+    get anchorIndex() {
+      return this.leadIndex;
+    },
+    set anchorIndex(anchorIndex) {
+      this.leadIndex = anchorIndex;
+    },
 
     /**
      * Whether the selection model supports multiple selected items.
      * @type {boolean}
      */
-    get multiple() { return false; },
+    get multiple() {
+      return false;
+    },
 
     /**
      * Adjusts the selection after reordering of items in the table.
@@ -218,7 +237,9 @@
      * Adjusts selection model length.
      * @param {number} length New selection model length.
      */
-    adjustLength: function(length) { this.length_ = length; }
+    adjustLength: function(length) {
+      this.length_ = length;
+    }
   };
 
   return {ListSingleSelectionModel: ListSingleSelectionModel};
diff --git a/ui/webui/resources/js/cr/ui/menu.js b/ui/webui/resources/js/cr/ui/menu.js
index cac465d..8201397 100644
--- a/ui/webui/resources/js/cr/ui/menu.js
+++ b/ui/webui/resources/js/cr/ui/menu.js
@@ -77,7 +77,9 @@
     /**
      * Clears menu.
      */
-    clear: function() { this.textContent = ''; },
+    clear: function() {
+      this.textContent = '';
+    },
 
     /**
      * Walks up the ancestors of |node| until a menu item belonging to this menu
@@ -108,7 +110,9 @@
      * @param {Event} e The mouseout event.
      * @private
      */
-    handleMouseOut_: function(e) { this.selectedItem = null; },
+    handleMouseOut_: function(e) {
+      this.selectedItem = null;
+    },
 
     /**
      * If there's a mouseup that happens quickly in about the same position,
@@ -137,7 +141,9 @@
      * @private
      * @suppress {checkTypes}
      */
-    trustEvent_: function(e) { return e.isTrusted || e.isTrustedForTesting; },
+    trustEvent_: function(e) {
+      return e.isTrusted || e.isTrustedForTesting;
+    },
 
     get menuItems() {
       return this.querySelectorAll(this.menuItemSelector || '*');
@@ -147,7 +153,9 @@
      * The selected menu item or null if none.
      * @type {cr.ui.MenuItem}
      */
-    get selectedItem() { return this.menuItems[this.selectedIndex]; },
+    get selectedItem() {
+      return this.menuItems[this.selectedIndex];
+    },
     set selectedItem(item) {
       var index = Array.prototype.indexOf.call(this.menuItems, item);
       this.selectedIndex = index;
@@ -172,7 +180,9 @@
     /**
      * Menu length
      */
-    get length() { return this.menuItems.length; },
+    get length() {
+      return this.menuItems.length;
+    },
 
     /**
      * Returns if the menu has any visible item.
diff --git a/ui/webui/resources/js/cr/ui/menu_button.js b/ui/webui/resources/js/cr/ui/menu_button.js
index a42aa3e..d54de2d 100644
--- a/ui/webui/resources/js/cr/ui/menu_button.js
+++ b/ui/webui/resources/js/cr/ui/menu_button.js
@@ -67,7 +67,9 @@
      * The menu associated with the menu button.
      * @type {cr.ui.Menu}
      */
-    get menu() { return this.menu_; },
+    get menu() {
+      return this.menu_;
+    },
     set menu(menu) {
       if (typeof menu == 'string' && menu[0] == '#') {
         menu = assert(this.ownerDocument.getElementById(menu.slice(1)));
@@ -240,7 +242,9 @@
     /**
      * Whether the menu is shown.
      */
-    isMenuShown: function() { return this.hasAttribute('menu-shown'); },
+    isMenuShown: function() {
+      return this.hasAttribute('menu-shown');
+    },
 
     /**
      * Positions the menu below the menu button. At this point we do not use any
diff --git a/ui/webui/resources/js/cr/ui/menu_item.js b/ui/webui/resources/js/cr/ui/menu_item.js
index eaf5b62..17f2783 100644
--- a/ui/webui/resources/js/cr/ui/menu_item.js
+++ b/ui/webui/resources/js/cr/ui/menu_item.js
@@ -58,7 +58,9 @@
      * @type {cr.ui.Command}
      */
     command_: null,
-    get command() { return this.command_; },
+    get command() {
+      return this.command_;
+    },
     set command(command) {
       if (this.command_) {
         this.command_.removeEventListener('labelChange', this);
@@ -96,20 +98,30 @@
      * The text label.
      * @type {string}
      */
-    get label() { return this.textContent; },
-    set label(label) { this.textContent = label; },
+    get label() {
+      return this.textContent;
+    },
+    set label(label) {
+      this.textContent = label;
+    },
 
     /**
      * Menu icon.
      * @type {string}
      */
-    get iconUrl() { return this.style.backgroundImage; },
-    set iconUrl(url) { this.style.backgroundImage = 'url(' + url + ')'; },
+    get iconUrl() {
+      return this.style.backgroundImage;
+    },
+    set iconUrl(url) {
+      this.style.backgroundImage = 'url(' + url + ')';
+    },
 
     /**
      * @return {boolean} Whether the menu item is a separator.
      */
-    isSeparator: function() { return this.tagName == 'HR'; },
+    isSeparator: function() {
+      return this.tagName == 'HR';
+    },
 
     /**
      * Updates shortcut text according to associated command. If command has
diff --git a/ui/webui/resources/js/cr/ui/overlay.js b/ui/webui/resources/js/cr/ui/overlay.js
index 2ea09c34..2e068c4 100644
--- a/ui/webui/resources/js/cr/ui/overlay.js
+++ b/ui/webui/resources/js/cr/ui/overlay.js
@@ -26,7 +26,9 @@
    * @return {HTMLElement} The default button.
    */
   function getDefaultButton(overlay) {
-    function isHidden(node) { return node.hidden; }
+    function isHidden(node) {
+      return node.hidden;
+    }
     var defaultButtons = /** @type !NodeList<!HTMLElement> */ (
         overlay.querySelectorAll('.page .button-strip > .default-button'));
     for (var i = 0; i < defaultButtons.length; i++) {
@@ -111,8 +113,9 @@
       else
         this.removeAttribute('hidden');
     });
-    overlay.__defineGetter__(
-        'hidden', function() { return this.hasAttribute('hidden'); });
+    overlay.__defineGetter__('hidden', function() {
+      return this.hasAttribute('hidden');
+    });
 
     // Shake when the user clicks away.
     overlay.addEventListener('click', function(e) {
diff --git a/ui/webui/resources/js/cr/ui/page_manager/page.js b/ui/webui/resources/js/cr/ui/page_manager/page.js
index d4ad892..bf5117e8 100644
--- a/ui/webui/resources/js/cr/ui/page_manager/page.js
+++ b/ui/webui/resources/js/cr/ui/page_manager/page.js
@@ -78,7 +78,9 @@
      * Sets focus on the first focusable element. Override for a custom focus
      * strategy.
      */
-    focus: function() { cr.ui.setInitialFocus(this.pageDiv); },
+    focus: function() {
+      cr.ui.setInitialFocus(this.pageDiv);
+    },
 
     /**
      * Reverse any buttons strips in this page (only applies to overlays).
@@ -94,7 +96,9 @@
      * Whether it should be possible to show the page.
      * @return {boolean} True if the page should be shown.
      */
-    canShowPage: function() { return true; },
+    canShowPage: function() {
+      return true;
+    },
 
     /**
      * Updates the hash of the current page. If the page is topmost, the history
@@ -183,13 +187,17 @@
      * page even if sub-pages change.
      * @type {boolean} True if this page is sticky.
      */
-    get sticky() { return false; },
+    get sticky() {
+      return false;
+    },
 
     /**
      * @type {boolean} True if this page should always be considered the
      *     top-most page when visible.
      */
-    get alwaysOnTop() { return this.alwaysOnTop_; },
+    get alwaysOnTop() {
+      return this.alwaysOnTop_;
+    },
 
     /**
      * @type {boolean} True if this page should always be considered the
diff --git a/ui/webui/resources/js/cr/ui/page_manager/page_manager.js b/ui/webui/resources/js/cr/ui/page_manager/page_manager.js
index 325bacf..99599b1 100644
--- a/ui/webui/resources/js/cr/ui/page_manager/page_manager.js
+++ b/ui/webui/resources/js/cr/ui/page_manager/page_manager.js
@@ -447,13 +447,17 @@
      * Change the horizontal offset used to reposition elements while showing an
      * overlay from the default.
      */
-    set horizontalOffset(value) { this.horizontalOffset_ = value; },
+    set horizontalOffset(value) {
+      this.horizontalOffset_ = value;
+    },
 
     /**
      * @param {!cr.ui.pageManager.PageManager.Observer} observer The observer to
      *     register.
      */
-    addObserver: function(observer) { this.observers_.push(observer); },
+    addObserver: function(observer) {
+      this.observers_.push(observer);
+    },
 
     /**
      * Shows a registered overlay page. Does not update history.
@@ -509,7 +513,9 @@
      * @return {boolean} True if an overlay is visible.
      * @private
      */
-    isOverlayVisible_: function() { return this.getVisibleOverlay_() != null; },
+    isOverlayVisible_: function() {
+      return this.getVisibleOverlay_() != null;
+    },
 
     /**
      * Returns the currently visible overlay, or null if no page is visible.
@@ -673,7 +679,9 @@
      * but should only behave as if they are fixed for vertical scrolling.
      * @private
      */
-    handleScroll_: function() { this.updateAllFrozenElementPositions_(); },
+    handleScroll_: function() {
+      this.updateAllFrozenElementPositions_();
+    },
 
     /**
      * Updates all frozen pages to match the horizontal scroll position.
diff --git a/ui/webui/resources/js/cr/ui/repeating_button.js b/ui/webui/resources/js/cr/ui/repeating_button.js
index 26124fd9..d125afde 100644
--- a/ui/webui/resources/js/cr/ui/repeating_button.js
+++ b/ui/webui/resources/js/cr/ui/repeating_button.js
@@ -115,7 +115,9 @@
      * @param {!Event} e The triggered event.
      * @private
      */
-    buttonUp_: function(e) { this.clearTimeout_(); },
+    buttonUp_: function(e) {
+      this.clearTimeout_();
+    },
 
     /**
      * Resets the interval callback.
@@ -144,25 +146,33 @@
      * Getter for the initial delay before repeating.
      * @type {number} The delay in milliseconds.
      */
-    get repeatDelay() { return this.holdDelayTime_; },
+    get repeatDelay() {
+      return this.holdDelayTime_;
+    },
 
     /**
      * Setter for the initial delay before repeating.
      * @type {number} The delay in milliseconds.
      */
-    set repeatDelay(delay) { this.holdDelayTime_ = delay; },
+    set repeatDelay(delay) {
+      this.holdDelayTime_ = delay;
+    },
 
     /**
      * Getter for the repeat interval.
      * @type {number} The repeat interval in milliseconds.
      */
-    get repeatInterval() { return this.holdRepeatIntervalTime_; },
+    get repeatInterval() {
+      return this.holdRepeatIntervalTime_;
+    },
 
     /**
      * Setter for the repeat interval.
      * @type {number} The interval in milliseconds.
      */
-    set repeatInterval(delay) { this.holdRepeatIntervalTime_ = delay; }
+    set repeatInterval(delay) {
+      this.holdRepeatIntervalTime_ = delay;
+    }
   };
 
   return {RepeatingButton: RepeatingButton};
diff --git a/ui/webui/resources/js/cr/ui/splitter.js b/ui/webui/resources/js/cr/ui/splitter.js
index b2c601a..6b659bc 100644
--- a/ui/webui/resources/js/cr/ui/splitter.js
+++ b/ui/webui/resources/js/cr/ui/splitter.js
@@ -78,7 +78,9 @@
      * @param {boolean} resizeNext True if resize the next element.
      *     By default, splitter resizes previous (left) element.
      */
-    set resizeNextElement(resizeNext) { this.resizeNextElement_ = resizeNext; },
+    set resizeNextElement(resizeNext) {
+      this.resizeNextElement_ = resizeNext;
+    },
 
     /**
      * Starts the dragging of the splitter. Adds listeners for mouse or touch
@@ -187,7 +189,9 @@
      * @param {!MouseEvent} e The mouse event.
      * @private
      */
-    handleMouseMove_: function(e) { this.handleMove_(e.clientX); },
+    handleMouseMove_: function(e) {
+      this.handleMove_(e.clientX);
+    },
 
     /**
      * Handles the touch move event.
@@ -218,7 +222,9 @@
      * @param {!MouseEvent} e The mouse event.
      * @private
      */
-    handleMouseUp_: function(e) { this.endDrag_(); },
+    handleMouseUp_: function(e) {
+      this.endDrag_();
+    },
 
     /**
      * Handles start of the splitter dragging. Saves current width of the
diff --git a/ui/webui/resources/js/cr/ui/table.js b/ui/webui/resources/js/cr/ui/table.js
index fed8ea7..9e28e4c 100644
--- a/ui/webui/resources/js/cr/ui/table.js
+++ b/ui/webui/resources/js/cr/ui/table.js
@@ -32,7 +32,9 @@
      *
      * @type {cr.ui.ArrayDataModel}
      */
-    get dataModel() { return this.list_.dataModel; },
+    get dataModel() {
+      return this.list_.dataModel;
+    },
     set dataModel(dataModel) {
       if (this.list_.dataModel != dataModel) {
         if (this.list_.dataModel) {
@@ -61,14 +63,18 @@
      *
      * @type {cr.ui.List}
      */
-    get list() { return this.list_; },
+    get list() {
+      return this.list_;
+    },
 
     /**
      * The table column model.
      *
      * @type {cr.ui.table.TableColumnModel}
      */
-    get columnModel() { return this.columnModel_; },
+    get columnModel() {
+      return this.columnModel_;
+    },
     set columnModel(columnModel) {
       if (this.columnModel_ != columnModel) {
         if (this.columnModel_)
@@ -88,7 +94,9 @@
      * @type
      * {cr.ui.ListSelectionModel|cr.ui.ListSingleSelectionModel}
      */
-    get selectionModel() { return this.list_.selectionModel; },
+    get selectionModel() {
+      return this.list_.selectionModel;
+    },
     set selectionModel(selectionModel) {
       if (this.list_.selectionModel != selectionModel) {
         if (this.dataModel)
@@ -102,17 +110,27 @@
      *
      * @type {boolean}
      */
-    get autoExpands() { return this.list_.autoExpands; },
-    set autoExpands(autoExpands) { this.list_.autoExpands = autoExpands; },
+    get autoExpands() {
+      return this.list_.autoExpands;
+    },
+    set autoExpands(autoExpands) {
+      this.list_.autoExpands = autoExpands;
+    },
 
-    get fixedHeight() { return this.list_.fixedHeight; },
-    set fixedHeight(fixedHeight) { this.list_.fixedHeight = fixedHeight; },
+    get fixedHeight() {
+      return this.list_.fixedHeight;
+    },
+    set fixedHeight(fixedHeight) {
+      this.list_.fixedHeight = fixedHeight;
+    },
 
     /**
      * Returns render function for row.
      * @return {function(*, cr.ui.Table): HTMLElement} Render function.
      */
-    getRenderFunction: function() { return this.list_.renderFunction_; },
+    getRenderFunction: function() {
+      return this.list_.renderFunction_;
+    },
 
     /**
      * Sets render function for row.
@@ -132,7 +150,9 @@
      *
      * @type {cr.ui.table.TableColumnModel}
      */
-    get header() { return this.header_; },
+    get header() {
+      return this.header_;
+    },
 
     /**
      * Initializes the element.
@@ -199,7 +219,9 @@
      * Ensures that a given index is inside the viewport.
      * @param {number} i The index of the item to scroll into view.
      */
-    scrollIndexIntoView: function(i) { this.list_.scrollIndexIntoView(i); },
+    scrollIndexIntoView: function(i) {
+      this.list_.scrollIndexIntoView(i);
+    },
 
     /**
      * Find the list item element at the given index.
@@ -215,7 +237,9 @@
      * After sorting we need to redraw header
      * @param {Event} e The 'sorted' event.
      */
-    handleSorted_: function(e) { this.header_.redraw(); },
+    handleSorted_: function(e) {
+      this.header_.redraw();
+    },
 
     /**
      * This handles data model 'change' and 'splice' events.
diff --git a/ui/webui/resources/js/cr/ui/table/table_column.js b/ui/webui/resources/js/cr/ui/table/table_column.js
index 5977383..c5febce 100644
--- a/ui/webui/resources/js/cr/ui/table/table_column.js
+++ b/ui/webui/resources/js/cr/ui/table/table_column.js
@@ -75,14 +75,18 @@
      * The width of the column.  Hidden columns have zero width.
      * @type {number}
      */
-    get width() { return this.visible_ ? this.width_ : 0; },
+    get width() {
+      return this.visible_ ? this.width_ : 0;
+    },
 
     /**
      * The width of the column, disregarding visibility.  For hidden columns,
      * this would be the width of the column if it were to be made visible.
      * @type {number}
      */
-    get absoluteWidth() { return this.width_; },
+    get absoluteWidth() {
+      return this.width_;
+    },
   };
 
   /**
diff --git a/ui/webui/resources/js/cr/ui/table/table_column_model.js b/ui/webui/resources/js/cr/ui/table/table_column_model.js
index 1f6322b..d2067c8 100644
--- a/ui/webui/resources/js/cr/ui/table/table_column_model.js
+++ b/ui/webui/resources/js/cr/ui/table/table_column_model.js
@@ -32,14 +32,18 @@
      * The number of the columns.
      * @type {number}
      */
-    get size() { return this.columns_.length; },
+    get size() {
+      return this.columns_.length;
+    },
 
     /**
      * Returns id of column at the given index.
      * @param {number} index The index of the column.
      * @return {string} Column id.
      */
-    getId: function(index) { return this.columns_[index].id; },
+    getId: function(index) {
+      return this.columns_[index].id;
+    },
 
     /**
      * Returns name of column at the given index. Name is used as column header
@@ -47,7 +51,9 @@
      * @param {number} index The index of the column.
      * @return {string} Column name.
      */
-    getName: function(index) { return this.columns_[index].name; },
+    getName: function(index) {
+      return this.columns_[index].name;
+    },
 
     /**
      * Sets name of column at the given index.
@@ -69,14 +75,18 @@
      * @param {number} index The index of the column.
      * @return {string} Column width in pixels.
      */
-    getWidth: function(index) { return this.columns_[index].width; },
+    getWidth: function(index) {
+      return this.columns_[index].width;
+    },
 
     /**
      * Check if the column at the given index should align to the end.
      * @param {number} index The index of the column.
      * @return {boolean} True if the column is aligned to end.
      */
-    isEndAlign: function(index) { return this.columns_[index].endAlign; },
+    isEndAlign: function(index) {
+      return this.columns_[index].endAlign;
+    },
 
     /**
      * Sets width of column at the given index.
@@ -203,7 +213,9 @@
      * @param {number} index The column index.
      * @return {boolean} Whether the column is visible.
      */
-    isVisible: function(index) { return this.columns_[index].visible; }
+    isVisible: function(index) {
+      return this.columns_[index].visible;
+    }
   };
 
   return {TableColumnModel: TableColumnModel};
diff --git a/ui/webui/resources/js/cr/ui/table/table_header.js b/ui/webui/resources/js/cr/ui/table/table_header.js
index 053448b..d82394b8 100644
--- a/ui/webui/resources/js/cr/ui/table/table_header.js
+++ b/ui/webui/resources/js/cr/ui/table/table_header.js
@@ -64,7 +64,9 @@
 
     batchCount_: 0,
 
-    startBatchUpdates: function() { this.batchCount_++; },
+    startBatchUpdates: function() {
+      this.batchCount_++;
+    },
 
     endBatchUpdates: function() {
       this.batchCount_--;
@@ -180,7 +182,9 @@
      * @param {number} index The index of the column to sort by.
      */
     createSortFunction_: function(index) {
-      return function() { this.table_.sort(index); }.bind(this);
+      return function() {
+        this.table_.sort(index);
+      }.bind(this);
     },
 
     /**
@@ -221,7 +225,9 @@
      * @param {number} index Column index.
      * @param {Event} e The double click event.
      */
-    handleDblClick_: function(index, e) { this.table_.fitColumn(index); },
+    handleDblClick_: function(index, e) {
+      this.table_.fitColumn(index);
+    },
 
     /**
      * Determines whether a full redraw is required.
diff --git a/ui/webui/resources/js/cr/ui/tabs.js b/ui/webui/resources/js/cr/ui/tabs.js
index e3a26495..deccce91 100644
--- a/ui/webui/resources/js/cr/ui/tabs.js
+++ b/ui/webui/resources/js/cr/ui/tabs.js
@@ -10,8 +10,9 @@
    * @return {TabBox} The tab box if found.
    */
   function getTabBox(el) {
-    return findAncestor(
-        el, function(node) { return node.tagName == 'TABBOX'; });
+    return findAncestor(el, function(node) {
+      return node.tagName == 'TABBOX';
+    });
   }
 
   /**
diff --git a/ui/webui/resources/js/cr/ui/touch_handler.js b/ui/webui/resources/js/cr/ui/touch_handler.js
index b0e2f102..dc7c818 100644
--- a/ui/webui/resources/js/cr/ui/touch_handler.js
+++ b/ui/webui/resources/js/cr/ui/touch_handler.js
@@ -414,7 +414,9 @@
      * Begin tracking the touchable element, it is eligible for dragging.
      * @private
      */
-    beginTracking_: function() { this.tracking_ = true; },
+    beginTracking_: function() {
+      this.tracking_ = true;
+    },
 
     /**
      * Stop tracking the touchable element, it is no longer dragging.
diff --git a/ui/webui/resources/js/cr/ui/tree.js b/ui/webui/resources/js/cr/ui/tree.js
index 04b68ae..53d6da5 100644
--- a/ui/webui/resources/js/cr/ui/tree.js
+++ b/ui/webui/resources/js/cr/ui/tree.js
@@ -64,13 +64,17 @@
     /**
      * Returns the tree item that are children of this tree.
      */
-    get items() { return this.children; },
+    get items() {
+      return this.children;
+    },
 
     /**
      * Adds a tree item to the tree.
      * @param {!cr.ui.TreeItem} treeItem The item to add.
      */
-    add: function(treeItem) { this.addAt(treeItem, 0xffffffff); },
+    add: function(treeItem) {
+      this.addAt(treeItem, 0xffffffff);
+    },
 
     /**
      * Adds a tree item at the given index.
@@ -98,7 +102,9 @@
      * The depth of the node. This is 0 for the tree itself.
      * @type {number}
      */
-    get depth() { return 0; },
+    get depth() {
+      return 0;
+    },
 
     /**
      * Handles click events on the tree and forwards the event to the relevant
@@ -186,7 +192,9 @@
      * The selected tree item or null if none.
      * @type {cr.ui.TreeItem}
      */
-    get selectedItem() { return this.selectedItem_ || null; },
+    get selectedItem() {
+      return this.selectedItem_ || null;
+    },
     set selectedItem(item) {
       var oldSelectedItem = this.selectedItem_;
       if (oldSelectedItem != item) {
@@ -282,13 +290,18 @@
     /**
      * The tree items children.
      */
-    get items() { return this.lastElementChild.children; },
+    get items() {
+      return this.lastElementChild.children;
+    },
 
     /**
      * The depth of the tree item.
      * @type {number}
      */
-    depth_: 0, get depth() { return this.depth_; },
+    depth_: 0,
+    get depth() {
+      return this.depth_;
+    },
 
     /**
      * Sets the depth.
@@ -311,7 +324,9 @@
      * Adds a tree item as a child.
      * @param {!cr.ui.TreeItem} child The child to add.
      */
-    add: function(child) { this.addAt(child, 0xffffffff); },
+    add: function(child) {
+      this.addAt(child, 0xffffffff);
+    },
 
     /**
      * Adds a tree item as a child at a given index.
@@ -370,7 +385,9 @@
      * Whether the tree item is expanded or not.
      * @type {boolean}
      */
-    get expanded() { return this.hasAttribute('expanded'); },
+    get expanded() {
+      return this.hasAttribute('expanded');
+    },
     set expanded(b) {
       if (this.expanded == b)
         return;
@@ -417,20 +434,28 @@
      * The element representing the row that gets highlighted.
      * @type {!HTMLElement}
      */
-    get rowElement() { return this.firstElementChild; },
+    get rowElement() {
+      return this.firstElementChild;
+    },
 
     /**
      * The element containing the label text and the icon.
      * @type {!HTMLElement}
      */
-    get labelElement() { return this.firstElementChild.lastElementChild; },
+    get labelElement() {
+      return this.firstElementChild.lastElementChild;
+    },
 
     /**
      * The label text.
      * @type {string}
      */
-    get label() { return this.labelElement.textContent; },
-    set label(s) { this.labelElement.textContent = s; },
+    get label() {
+      return this.labelElement.textContent;
+    },
+    set label(s) {
+      this.labelElement.textContent = s;
+    },
 
     /**
      * The URL for the icon.
@@ -447,7 +472,9 @@
      * Whether the tree item is selected or not.
      * @type {boolean}
      */
-    get selected() { return this.hasAttribute('selected'); },
+    get selected() {
+      return this.hasAttribute('selected');
+    },
     set selected(b) {
       if (this.selected == b)
         return;
@@ -472,7 +499,9 @@
      * Whether the tree item has children.
      * @type {boolean}
      */
-    get mayHaveChildren_() { return this.hasAttribute('may-have-children'); },
+    get mayHaveChildren_() {
+      return this.hasAttribute('may-have-children');
+    },
     set mayHaveChildren_(b) {
       var rowItem = this.firstElementChild;
       if (b) {
@@ -488,7 +517,9 @@
      * Whether the tree item has children.
      * @type {boolean}
      */
-    get hasChildren() { return !!this.items[0]; },
+    get hasChildren() {
+      return !!this.items[0];
+    },
 
     /**
      * Whether the tree item has children.
@@ -547,7 +578,9 @@
         }
       }
 
-      function stopPropagation(e) { e.stopPropagation(); }
+      function stopPropagation(e) {
+        e.stopPropagation();
+      }
 
       if (editing) {
         this.selected = true;
@@ -564,8 +597,9 @@
           labelEl.appendChild(input);
 
         input.addEventListener('keydown', handleKeydown);
-        input.addEventListener(
-            'blur', (function() { this.editing = false; }).bind(this));
+        input.addEventListener('blur', (function() {
+                                         this.editing = false;
+                                       }).bind(this));
 
         // Make sure that double clicks do not expand and collapse the tree
         // item.
@@ -603,7 +637,9 @@
       }
     },
 
-    get editing() { return this.hasAttribute('editing'); }
+    get editing() {
+      return this.hasAttribute('editing');
+    }
   };
 
   /**
diff --git a/ui/webui/resources/js/i18n_behavior.js b/ui/webui/resources/js/i18n_behavior.js
index e8c55f5b..05c9cf6 100644
--- a/ui/webui/resources/js/i18n_behavior.js
+++ b/ui/webui/resources/js/i18n_behavior.js
@@ -64,7 +64,9 @@
    * @param {string} id
    * @return {boolean}
    */
-  i18nExists: function(id) { return loadTimeData.valueExists(id); },
+  i18nExists: function(id) {
+    return loadTimeData.valueExists(id);
+  },
 };
 
 /**
diff --git a/ui/webui/resources/js/load_time_data.js b/ui/webui/resources/js/load_time_data.js
index 1ed68a6..38b4721e 100644
--- a/ui/webui/resources/js/load_time_data.js
+++ b/ui/webui/resources/js/load_time_data.js
@@ -39,13 +39,17 @@
      * Returns a JsEvalContext for |data_|.
      * @returns {JsEvalContext}
      */
-    createJsEvalContext: function() { return new JsEvalContext(this.data_); },
+    createJsEvalContext: function() {
+      return new JsEvalContext(this.data_);
+    },
 
     /**
      * @param {string} id An ID of a value that might exist.
      * @return {boolean} True if |id| is a key in the dictionary.
      */
-    valueExists: function(id) { return id in this.data_; },
+    valueExists: function(id) {
+      return id in this.data_;
+    },
 
     /**
      * Fetches a value, expecting that it exists.
@@ -84,8 +88,9 @@
         return '';
 
       var varArgs = arguments;
-      return value.replace(
-          /\$[$1-9]/g, function(m) { return m == '$$' ? '$' : varArgs[m[1]]; });
+      return value.replace(/\$[$1-9]/g, function(m) {
+        return m == '$$' ? '$' : varArgs[m[1]];
+      });
     },
 
     /**
diff --git a/ui/webui/resources/js/parse_html_subset.js b/ui/webui/resources/js/parse_html_subset.js
index bd53e8e..e1e5739 100644
--- a/ui/webui/resources/js/parse_html_subset.js
+++ b/ui/webui/resources/js/parse_html_subset.js
@@ -69,8 +69,9 @@
   }
 
   return function(s, opt_extraTags, opt_extraAttrs) {
-    var extraTags =
-        (opt_extraTags || []).map(function(str) { return str.toUpperCase(); });
+    var extraTags = (opt_extraTags || []).map(function(str) {
+      return str.toUpperCase();
+    });
     var tags = allowedTags.concat(extraTags);
     var attrs = merge(allowedAttributes, opt_extraAttrs || {});
 
diff --git a/ui/webui/resources/js/promise_resolver.js b/ui/webui/resources/js/promise_resolver.js
index 58236360..64501d6 100644
--- a/ui/webui/resources/js/promise_resolver.js
+++ b/ui/webui/resources/js/promise_resolver.js
@@ -36,14 +36,26 @@
 
 PromiseResolver.prototype = {
   /** @return {!Promise<T>} */
-  get promise() { return this.promise_; },
-  set promise(p) { assertNotReached(); },
+  get promise() {
+    return this.promise_;
+  },
+  set promise(p) {
+    assertNotReached();
+  },
 
   /** @return {function(T=): void} */
-  get resolve() { return this.resolve_; },
-  set resolve(r) { assertNotReached(); },
+  get resolve() {
+    return this.resolve_;
+  },
+  set resolve(r) {
+    assertNotReached();
+  },
 
   /** @return {function(*=): void} */
-  get reject() { return this.reject_; },
-  set reject(s) { assertNotReached(); },
+  get reject() {
+    return this.reject_;
+  },
+  set reject(s) {
+    assertNotReached();
+  },
 };
diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
index 77d7835..cdc8ed7 100644
--- a/ui/webui/resources/js/util.js
+++ b/ui/webui/resources/js/util.js
@@ -40,7 +40,9 @@
   element.style.height = '0px';
   element.innerText = msg;
   document.body.appendChild(element);
-  window.setTimeout(function() { document.body.removeChild(element); }, 0);
+  window.setTimeout(function() {
+    document.body.removeChild(element);
+  }, 0);
 }
 
 /**
@@ -523,7 +525,9 @@
  */
 function importModules(moduleNames) {
   return new Promise(function(resolve) {
-    define(moduleNames, function() { resolve(Array.from(arguments)); });
+    define(moduleNames, function() {
+      resolve(Array.from(arguments));
+    });
   });
 }
 
diff --git a/ui/webui/resources/js/web_ui_listener_behavior.js b/ui/webui/resources/js/web_ui_listener_behavior.js
index d7fc56b5..35611ba 100644
--- a/ui/webui/resources/js/web_ui_listener_behavior.js
+++ b/ui/webui/resources/js/web_ui_listener_behavior.js
@@ -17,7 +17,9 @@
      */
     webUIListeners_: {
       type: Array,
-      value: function() { return []; },
+      value: function() {
+        return [];
+      },
     },
   },