Compile chrome://settings, part 7. 33 errors left

R=dbeam@chromium.org
BUG=393873
TEST=GYP_GENERATORS=ninja gyp --depth . chrome/browser/resources/options/compiled_resources.gyp && ninja -C out/Default | grep ERROR | wc -l

Review URL: https://codereview.chromium.org/559423003

Cr-Commit-Position: refs/heads/master@{#295637}

chrome/browser/resources/options/browser_options.js

@@ -2,6 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+cr.exportPath('options');
+
+/**
+ * @typedef {{actionLinkText: (string|undefined),
+ *            hasError: (boolean|undefined),
+ *            hasUnrecoverableError: (boolean|undefined),
+ *            managed: (boolean|undefined),
+ *            setupCompleted: (boolean|undefined),
+ *            setupInProgress: (boolean|undefined),
+ *            signedIn: (boolean|undefined),
+ *            signinAllowed: (boolean|undefined),
+ *            signinAllowed: boolean,
+ *            signoutAllowed: (boolean|undefined),
+ *            statusText: (string|undefined),
+ *            syncSystemEnabled: (boolean|undefined)}}
+ * @see chrome/browser/ui/webui/options/browser_options_handler.cc
+ */
+options.SyncStatus;
+
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var Page = cr.ui.pageManager.Page;
@@ -912,8 +931,8 @@ cr.define('options', function() {
 
     /**
      * Updates the sync section with the given state.
-     * @param {Object} syncData A bunch of data records that describe the status
-     *     of the sync system.
+     * @param {options.SyncStatus} syncData A bunch of data records that
+     *     describe the status of the sync system.
      * @private
      */
     updateSyncState_: function(syncData) {
@@ -953,7 +972,7 @@ cr.define('options', function() {
       if (this.signedIn_ && !syncData.signedIn && !syncData.setupInProgress)
         SyncSetupOverlay.closeOverlay();
 
-      this.signedIn_ = syncData.signedIn;
+      this.signedIn_ = !!syncData.signedIn;
 
       // Display the "advanced settings" button if we're signed in and sync is
       // not managed/disabled. If the user is signed in, but sync is disabled,
@@ -976,7 +995,7 @@ cr.define('options', function() {
       // already signed in and signout is not allowed.
       var signInButton = $('start-stop-sync');
       signInButton.disabled = syncData.setupInProgress;
-      this.signoutAllowed_ = syncData.signoutAllowed;
+      this.signoutAllowed_ = !!syncData.signoutAllowed;
       if (!syncData.signoutAllowed)
         $('start-stop-sync-indicator').setAttribute('controlled-by', 'policy');
       else
@@ -1058,7 +1077,7 @@ cr.define('options', function() {
 
     /**
      * Get the start/stop sync button DOM element. Used for testing.
-     * @return {DOMElement} The start/stop sync button.
+     * @return {Element} The start/stop sync button.
      * @private
      */
     getStartStopSyncButton_: function() {
@@ -1212,11 +1231,11 @@ cr.define('options', function() {
      */
     updateSearchEngines_: function(engines, defaultValue, defaultManaged) {
       this.clearSearchEngines_();
-      engineSelect = $('default-search-engine');
+      var engineSelect = $('default-search-engine');
       engineSelect.disabled = defaultManaged;
       if (defaultManaged && defaultValue == -1)
         return;
-      engineCount = engines.length;
+      var engineCount = engines.length;
       var defaultIndex = -1;
       for (var i = 0; i < engineCount; i++) {
         var engine = engines[i];
@@ -1322,15 +1341,9 @@ cr.define('options', function() {
 
     /**
      * Adds all |profiles| to the list.
-     * @param {Array.<Object>} profiles An array of profile info objects.
-     *     each object is of the form:
-     *       profileInfo = {
-     *         name: "Profile Name",
-     *         iconURL: "chrome://path/to/icon/image",
-     *         filePath: "/path/to/profile/data/on/disk",
-     *         isCurrentProfile: false,
-     *         isSupervised: false
-     *       };
+     * @param {Array.<{name: string, filePath: string,
+     *     isCurrentProfile: boolean, isSupervised: boolean}>} profiles An array
+     *     of profile info objects.
      * @private
      */
     setProfilesInfo_: function(profiles) {

chrome/browser/resources/options/browser_options_startup_page_list.js

@@ -11,7 +11,7 @@ cr.define('options.browser_options', function() {
    * Creates a new startup page list item.
    * @param {Object} pageInfo The page this item represents.
    * @constructor
-   * @extends {cr.ui.ListItem}
+   * @extends {options.InlineEditableItem}
    */
   function StartupPageListItem(pageInfo) {
     var el = cr.doc.createElement('div');
@@ -68,7 +68,7 @@ cr.define('options.browser_options', function() {
       urlEl.classList.add('weakrtl');
       this.contentElement.appendChild(urlEl);
 
-      var urlField = urlEl.querySelector('input');
+      var urlField = /** @type {HTMLElement} */(urlEl.querySelector('input'));
       urlField.className = 'weakrtl';
       urlField.placeholder = loadTimeData.getString('startupPagesPlaceholder');
       this.urlField_ = urlField;

chrome/browser/resources/options/content_settings.js

@@ -25,6 +25,7 @@ cr.define('options', function() {
   /**
    * Encapsulated handling of content settings page.
    * @constructor
+   * @extends {cr.ui.pageManager.Page}
    */
   function ContentSettings() {
     this.activeNavTab = null;
@@ -162,14 +163,16 @@ cr.define('options', function() {
    * Updates the labels and indicators for the Media settings. Those require
    * special handling because they are backed by multiple prefs and can change
    * their scope based on the managed state of the backing prefs.
-   * @param {Object} mediaSettings A dictionary containing the following fields:
-   *     {String} askText The label for the ask radio button.
-   *     {String} blockText The label for the block radio button.
-   *     {Boolean} cameraDisabled Whether to disable the camera dropdown.
-   *     {Boolean} micDisabled Whether to disable the microphone dropdown.
-   *     {Boolean} showBubble Wether to show the managed icon and bubble for the
-   *         media label.
-   *     {String} bubbleText The text to use inside the bubble if it is shown.
+   * @param {{askText: string, blockText: string, cameraDisabled: boolean,
+   *          micDisabled: boolean, showBubble: boolean, bubbleText: string}}
+   *     mediaSettings A dictionary containing the following fields:
+   *     askText The label for the ask radio button.
+   *     blockText The label for the block radio button.
+   *     cameraDisabled Whether to disable the camera dropdown.
+   *     micDisabled Whether to disable the microphone dropdown.
+   *     showBubble Wether to show the managed icon and bubble for the media
+   *                label.
+   *     bubbleText The text to use inside the bubble if it is shown.
    */
   ContentSettings.updateMediaUI = function(mediaSettings) {
     $('media-stream-ask-label').innerHTML =
@@ -234,8 +237,11 @@ cr.define('options', function() {
    *     exceptions list or null.
    */
   ContentSettings.getExceptionsList = function(type, mode) {
-    return document.querySelector(
+    var exceptionsList = document.querySelector(
         'div[contentType=' + type + '] list[mode=' + mode + ']');
+    return !exceptionsList ? null :
+        assertInstanceof(exceptionsList,
+                         options.contentSettings.ExceptionsList);
   };
 
   /**

chrome/browser/resources/options/content_settings_exceptions_area.js

@@ -454,7 +454,7 @@ cr.define('options.contentSettings', function() {
    * Creates a new exceptions list.
    *
    * @constructor
-   * @extends {cr.ui.List}
+   * @extends {options.InlineEditableItemList}
    */
   var ExceptionsList = cr.ui.define('list');
 

chrome/browser/resources/options/cookies_list.js

@@ -66,7 +66,7 @@ cr.define('options', function() {
    * into the given list using its @{code splice} method at the given index.
    * @param {Array.<Object>} data The data objects for the nodes to add.
    * @param {number} start The index at which to start inserting the nodes.
-   * @return {Array.<CookieTreeNode>} An array of CookieTreeNodes added.
+   * @return {Array.<options.CookieTreeNode>} An array of CookieTreeNodes added.
    */
   function spliceTreeNodes(data, start, list) {
     var nodes = data.map(function(x) { return new CookieTreeNode(x); });
@@ -109,7 +109,7 @@ cr.define('options', function() {
    * @extends {options.DeletableItem}
    */
   function CookieListItem(origin, list) {
-    var listItem = new DeletableItem(null);
+    var listItem = new DeletableItem();
     listItem.__proto__ = CookieListItem.prototype;
 
     listItem.origin = origin;
@@ -315,7 +315,7 @@ cr.define('options', function() {
 
     /**
      * Append a new cookie node "bubble" to this list item.
-     * @param {CookieTreeNode} node The cookie node to add a bubble for.
+     * @param {options.CookieTreeNode} node The cookie node to add a bubble for.
      * @param {Element} div The DOM element for the bubble itself.
      * @return {number} The index the bubble was added at.
      */
@@ -508,7 +508,8 @@ cr.define('options', function() {
     /**
      * Create the cookie "bubbles" for this node, recursing into children
      * if there are any. Append the cookie bubbles to @{code item}.
-     * @param {CookieListItem} item The cookie list item to create items in.
+     * @param {options.CookieListItem} item The cookie list item to create items
+     *     in.
      */
     createItems: function(item) {
       if (this.children.length > 0) {
@@ -581,7 +582,7 @@ cr.define('options', function() {
 
     /**
      * The parent of this cookie tree node.
-     * @type {?CookieTreeNode|CookieListItem}
+     * @type {?(options.CookieTreeNode|options.CookieListItem)}
      */
     get parent() {
       // See below for an explanation of this special case.
@@ -796,12 +797,15 @@ cr.define('options', function() {
 
     /**
      * The currently expanded item. Used by CookieListItem above.
-     * @type {?CookieListItem}
+     * @type {?options.CookieListItem}
      */
     expandedItem: null,
 
     // from cr.ui.List
-    /** @override */
+    /**
+     * @override
+     * @param {Object} data
+     */
     createItem: function(data) {
       // We use the cached expanded item in order to allow it to maintain some
       // state (like its fixed height, and which bubble is selected).
@@ -923,6 +927,8 @@ cr.define('options', function() {
   };
 
   return {
-    CookiesList: CookiesList
+    CookiesList: CookiesList,
+    CookieListItem: CookieListItem,
+    CookieTreeNode: CookieTreeNode,
   };
 });

chrome/browser/resources/options/easy_unlock_turn_off_overlay.js

@@ -34,7 +34,7 @@ cr.define('options', function() {
     __proto__: Page.prototype,
 
     /** Current UI state */
-    uiState_: UIState.UNKNKOWN,
+    uiState_: UIState.UNKNOWN,
     get uiState() {
       return this.uiState_;
     },

chrome/browser/resources/options/handler_options_list.js

@@ -58,6 +58,10 @@ cr.define('options', function() {
   IgnoredHandlersList.prototype = {
     __proto__: DeletableItemList.prototype,
 
+    /**
+     * @override
+     * @param {Object} entry
+     */
     createItem: function(entry) {
       return new IgnoredHandlersListItem(entry);
     },
@@ -78,7 +82,7 @@ cr.define('options', function() {
      * IgnoredHandlersListItem for an example of the format the list should
      * take.
      *
-     * @param {Object} list A list of ignored protocol handlers.
+     * @param {!Array} list A list of ignored protocol handlers.
      */
     setHandlers: function(list) {
       this.dataModel = new ArrayDataModel(list);

chrome/browser/resources/options/language_dictionary_overlay.js

@@ -49,8 +49,9 @@ cr.define('options', function() {
     initializePage: function() {
       Page.prototype.initializePage.call(this);
 
-      this.wordList_ = $('language-dictionary-overlay-word-list');
-      DictionaryWordsList.decorate(this.wordList_);
+      var wordList = $('language-dictionary-overlay-word-list');
+      DictionaryWordsList.decorate(wordList);
+      this.wordList_ = assertInstanceof(wordList, DictionaryWordsList);
       this.wordList_.onWordListChanged = function() {
         this.onWordListChanged_();
       }.bind(this);

chrome/browser/resources/options/language_dictionary_overlay_word_list.js

@@ -77,7 +77,7 @@ cr.define('options.dictionary_words', function() {
   /**
    * A list of words in the dictionary.
    * @constructor
-   * @extends {cr.ui.InlineEditableItemList}
+   * @extends {options.InlineEditableItemList}
    */
   var DictionaryWordsList = cr.ui.define('list');
 
@@ -86,7 +86,7 @@ cr.define('options.dictionary_words', function() {
 
     /**
      * The function to notify that the word list has changed.
-     * @type {function()}
+     * @type {?Function}
      */
     onWordListChanged: null,
 
@@ -204,7 +204,10 @@ cr.define('options.dictionary_words', function() {
       return this.dataModel.length < 2;
     },
 
-    /** @override */
+    /**
+     * @override
+     * @param {string} dictionaryWord
+     */
     createItem: function(dictionaryWord) {
       return new DictionaryWordsListItem(
           dictionaryWord,

chrome/browser/resources/options/language_list.js

@@ -14,7 +14,7 @@ cr.define('options', function() {
    * Creates a new Language list item.
    * @param {Object} languageInfo The information of the language.
    * @constructor
-   * @extends {options.DeletableItem.ListItem}
+   * @extends {options.DeletableItem}
    */
   function LanguageListItem(languageInfo) {
     var el = cr.doc.createElement('li');
@@ -29,7 +29,7 @@ cr.define('options', function() {
 
     /**
      * The language code of this language.
-     * @type {string}
+     * @type {?string}
      * @private
      */
     languageCode_: null,
@@ -56,7 +56,7 @@ cr.define('options', function() {
    * Creates a new language list.
    * @param {Object=} opt_propertyBag Optional properties.
    * @constructor
-   * @extends {cr.ui.List}
+   * @extends {options.DeletableItemList}
    */
   var LanguageList = cr.ui.define('list');
 
@@ -132,8 +132,13 @@ cr.define('options', function() {
       this.addEventListener('dragleave', this.handleDragLeave_.bind(this));
     },
 
+    /**
+     * @override
+     * @param {string} languageCode
+     */
     createItem: function(languageCode) {
-      languageInfo = LanguageList.getLanguageInfoFromLanguageCode(languageCode);
+      var languageInfo =
+          LanguageList.getLanguageInfoFromLanguageCode(languageCode);
       return new LanguageListItem(languageInfo);
     },
 
@@ -379,7 +384,7 @@ cr.define('options', function() {
 
     /**
      * Loads given language list.
-     * @param {Array} languageCodes List of language codes.
+     * @param {!Array} languageCodes List of language codes.
      * @private
      */
     load_: function(languageCodes) {

chrome/browser/resources/options/language_options.js

@@ -335,8 +335,7 @@ cr.define('options', function() {
           button.inputMethodId = inputMethod.id;
           button.onclick = function(inputMethodId, e) {
             chrome.send('inputMethodOptionsOpen', [inputMethodId]);
-          };
-          button.onclick = button.onclick.bind(this, inputMethod.id);
+          }.bind(this, inputMethod.id);
           element.appendChild(button);
         }
 
@@ -753,10 +752,9 @@ cr.define('options', function() {
 
     /**
      * Updates the language list in the add language overlay.
-     * @param {string} languageCode Language code (ex. "fr").
      * @private
      */
-    updateLanguageListInAddLanguageOverlay_: function(languageCode) {
+    updateLanguageListInAddLanguageOverlay_: function() {
       // Change the visibility of the language list in the add language
       // overlay. Languages that are already active will become invisible,
       // so that users don't add the same language twice.
@@ -830,7 +828,7 @@ cr.define('options', function() {
      * @private
      */
     handleCheckboxClick_: function(e) {
-      var checkbox = e.target;
+      var checkbox = assertInstanceof(e.target, Element);
 
       // Third party IMEs require additional confirmation prior to enabling due
       // to privacy risk.
@@ -917,7 +915,7 @@ cr.define('options', function() {
     updateEnableSpellCheck_: function(e) {
        var value = !$('enable-spell-check').checked;
        $('language-options-spell-check-language-button').disabled = value;
-       if (!cr.IsMac)
+       if (!cr.isMac)
          $('edit-dictionary-button').hidden = value;
      },
 
@@ -1171,10 +1169,17 @@ cr.define('options', function() {
     // If this will go as final UI, refactor this to share the component with
     // new new tab page.
     /**
-     * Shows notification
      * @private
      */
     notificationTimeout_: null,
+
+    /**
+     * Shows notification.
+     * @param {string} text
+     * @param {string} actionText
+     * @param {number=} opt_delay
+     * @private
+     */
     showNotification_: function(text, actionText, opt_delay) {
       var notificationElement = $('notification');
       var actionLink = notificationElement.querySelector('.link-color');

chrome/browser/resources/options/manage_profile_overlay.js

@@ -211,7 +211,7 @@ cr.define('options', function() {
      * the user will use to choose their profile icon.
      * @param {string} mode A label that specifies the type of dialog box which
      *     is currently being viewed (i.e. 'create' or 'manage').
-     * @param {Array.<string>} iconURLs An array of icon URLs.
+     * @param {!Array.<string>} iconURLs An array of icon URLs.
      * @param {Array.<string>} names An array of default names
      *     corresponding to the icons.
      * @private
@@ -461,6 +461,9 @@ cr.define('options', function() {
         options.SupervisedUserListData.resetPromise();
     },
 
+    /** @private */
+    updateSignedInStatus_: assertNotReached,
+
     /**
      * Called when the user clicks "OK" or hits enter. Creates the profile
      * using the information in the dialog.

chrome/browser/resources/options/origin_resources_list.js

@@ -63,7 +63,10 @@ cr.define('options', function() {
   OriginList.prototype = {
     __proto__: List.prototype,
 
-    /** @override */
+    /**
+     * @override
+     * @param {!Object} entry
+     */
     createItem: function(entry) {
       return new OriginListItem(entry);
     },

chrome/browser/resources/options/password_manager.js

@@ -88,8 +88,10 @@ cr.define('options', function() {
      * @private
      */
     createSavedPasswordsList_: function() {
-      this.savedPasswordsList_ = $('saved-passwords-list');
-      options.passwordManager.PasswordsList.decorate(this.savedPasswordsList_);
+      var savedPasswordsList = $('saved-passwords-list');
+      options.passwordManager.PasswordsList.decorate(savedPasswordsList);
+      this.savedPasswordsList_ = assertInstanceof(savedPasswordsList,
+          options.DeletableItemList);
       this.savedPasswordsList_.autoExpands = true;
     },
 
@@ -98,9 +100,11 @@ cr.define('options', function() {
      * @private
      */
     createPasswordExceptionsList_: function() {
-      this.passwordExceptionsList_ = $('password-exceptions-list');
+      var passwordExceptionsList = $('password-exceptions-list');
       options.passwordManager.PasswordExceptionsList.decorate(
-          this.passwordExceptionsList_);
+          passwordExceptionsList);
+      this.passwordExceptionsList_ = assertInstanceof(passwordExceptionsList,
+          options.DeletableItemList);
       this.passwordExceptionsList_.autoExpands = true;
     },
 
@@ -151,7 +155,7 @@ cr.define('options', function() {
     /**
      * Updates the data model for the saved passwords list with the values from
      * |entries|.
-     * @param {Array} entries The list of saved password data.
+     * @param {!Array} entries The list of saved password data.
      */
     setSavedPasswordsList_: function(entries) {
       if (this.lastQuery_) {

chrome/browser/resources/options/supervised_user_import.js

@@ -231,6 +231,7 @@ cr.define('options', function() {
 
   // Forward public APIs to private implementations.
   cr.makePublic(SupervisedUserImportOverlay, [
+    'onError',
     'onSuccess',
   ]);
 

chrome/browser/resources/options/website_settings.js

@@ -50,7 +50,7 @@ cr.define('options.ContentSettings', function() {
 
     /**
      * The saved blocked origins list.
-     * @type {OriginList}
+     * @type {options.OriginList}
      * @private
      */
     blockedList_: null,
@@ -116,7 +116,7 @@ cr.define('options.ContentSettings', function() {
     /**
      * Populate an origin list with all of the origins with a given permission
      * or that are using a given resource.
-     * @param {OriginList} originList A list to populate.
+     * @param {options.OriginList} originList A list to populate.
      * @param {!Object} originDict A dictionary of origins to their usage, which
            will be used to sort the origins.
      * @private

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -1367,6 +1367,9 @@ void BrowserOptionsHandler::OnWallpaperManagedChanged(bool managed) {
 
 scoped_ptr<base::DictionaryValue>
 BrowserOptionsHandler::GetSyncStateDictionary() {
+  // The items which are to be written into |sync_status| are also described in
+  // chrome/browser/resources/options/browser_options.js in @typedef
+  // for SyncStatus. Please update it whenever you add or remove any keys here.
   scoped_ptr<base::DictionaryValue> sync_status(new base::DictionaryValue);
   Profile* profile = Profile::FromWebUI(web_ui());
   if (profile->IsGuestSession()) {