diff options
208 files changed, 617 insertions, 616 deletions
diff --git a/chrome/browser/resources/about_invalidations.js b/chrome/browser/resources/about_invalidations.js index 83a187a..0aaf837 100644 --- a/chrome/browser/resources/about_invalidations.js +++ b/chrome/browser/resources/about_invalidations.js @@ -68,7 +68,7 @@ cr.define('chrome.invalidations', function() { /** * Adds to the log the latest invalidations received - * @param {!Array.<!Object>} allInvalidations The array of ObjectId + * @param {!Array<!Object>} allInvalidations The array of ObjectId * that contains the invalidations received by the InvalidatorService. */ function logInvalidations(allInvalidations) { @@ -139,7 +139,7 @@ cr.define('chrome.invalidations', function() { /** * Shows the handlers that are currently registered for invalidations * (but might not have objects ids registered yet). - * @param {!Array.<string>} allHandlers An array of Strings that are + * @param {!Array<string>} allHandlers An array of Strings that are * the names of all the handlers currently registered in the * InvalidatorService. */ diff --git a/chrome/browser/resources/about_version.js b/chrome/browser/resources/about_version.js index d971917..476311b 100644 --- a/chrome/browser/resources/about_version.js +++ b/chrome/browser/resources/about_version.js @@ -6,7 +6,7 @@ * Callback from the backend with the list of variations to display. * This call will build the variations section of the version page, or hide that * section if there are none to display. - * @param {!Array.<string>} variationsList The list of variations. + * @param {!Array<string>} variationsList The list of variations. */ function returnVariationInfo(variationsList) { $('variations-section').hidden = !variationsList.length; diff --git a/chrome/browser/resources/bookmark_manager/js/bmm.js b/chrome/browser/resources/bookmark_manager/js/bmm.js index f010d82..1e55fc8 100644 --- a/chrome/browser/resources/bookmark_manager/js/bmm.js +++ b/chrome/browser/resources/bookmark_manager/js/bmm.js @@ -36,7 +36,7 @@ cr.define('bmm', function() { * Promise version of chrome.bookmarkManagerPrivate.getSubtree. * @param {string} id . * @param {boolean} foldersOnly . - * @return {!Promise.<!Array.<!BookmarkTreeNode>>} . + * @return {!Promise<!Array<!BookmarkTreeNode>>} . */ function getSubtreePromise(id, foldersOnly) { return new Promise(function(resolve) { @@ -48,7 +48,7 @@ cr.define('bmm', function() { * Loads a subtree of the bookmark tree and returns a {@code Promise} that * will be fulfilled when done. This reuses multiple loads so that we do not * load the same subtree more than once at the same time. - * @return {!Promise.<!BookmarkTreeNode>} The future promise for the load. + * @return {!Promise<!BookmarkTreeNode>} The future promise for the load. */ function loadSubtree(id) { if (!loadingPromises[id]) { @@ -64,7 +64,7 @@ cr.define('bmm', function() { * Loads the entire bookmark tree and returns a {@code Promise} that will * be fulfilled when done. This reuses multiple loads so that we do not load * the same tree more than once at the same time. - * @return {!Promise.<!BookmarkTreeNode>} The future promise for the load. + * @return {!Promise<!BookmarkTreeNode>} The future promise for the load. */ function loadTree() { return loadSubtree(''); diff --git a/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js b/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js index f825da2..b53f06c 100644 --- a/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js +++ b/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js @@ -6,7 +6,7 @@ // that handles the loading and the events from the bookmark backend. /** - * @typedef {{childIds: Array.<string>}} + * @typedef {{childIds: Array<string>}} * * @see chrome/common/extensions/api/bookmarks.json */ @@ -30,7 +30,7 @@ cr.define('bmm', function() { /** * Basic array data model for use with bookmarks. - * @param {!Array.<!BookmarkTreeNode>} items The bookmark items. + * @param {!Array<!BookmarkTreeNode>} items The bookmark items. * @constructor * @extends {ArrayDataModel} */ @@ -128,7 +128,7 @@ cr.define('bmm', function() { /** * Callback function for loading items. - * @param {Array.<!BookmarkTreeNode>} items The loaded items. + * @param {Array<!BookmarkTreeNode>} items The loaded items. * @private */ handleBookmarkCallback_: function(items) { diff --git a/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_tree.js b/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_tree.js index e622db7..a34d520 100644 --- a/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_tree.js +++ b/chrome/browser/resources/bookmark_manager/js/bmm/bookmark_tree.js @@ -139,7 +139,7 @@ cr.define('bmm', function() { chrome.bookmarks.getChildren(parent.bookmarkNode.id, function(children) { var isFolder = /** * @type {function (BookmarkTreeNode, number, - * Array.<(BookmarkTreeNode)>)} + * Array<(BookmarkTreeNode)>)} */(bmm.isFolder); var index = children.filter(isFolder).map(function(item) { return item.id; @@ -264,7 +264,7 @@ cr.define('bmm', function() { * parentTreeItem. * @param {!cr.ui.Tree|!cr.ui.TreeItem} parentTreeItem The parent tree * element to append to. - * @param {!Array.<BookmarkTreeNode>} bookmarkNodes A list of bookmark + * @param {!Array<BookmarkTreeNode>} bookmarkNodes A list of bookmark * nodes to be added. * @return {boolean} Whether any directories where added. */ diff --git a/chrome/browser/resources/bookmark_manager/js/main.js b/chrome/browser/resources/bookmark_manager/js/main.js index 7a26bc9..efbac59 100644 --- a/chrome/browser/resources/bookmark_manager/js/main.js +++ b/chrome/browser/resources/bookmark_manager/js/main.js @@ -16,7 +16,7 @@ /** * An array containing the BookmarkTreeNodes that were deleted in the last * deletion action. This is used for implementing undo. - * @type {?{nodes: Array.<Array.<BookmarkTreeNode>>, target: EventTarget}} + * @type {?{nodes: Array<Array<BookmarkTreeNode>>, target: EventTarget}} */ var lastDeleted; @@ -308,8 +308,8 @@ function handleLoadForTree(e) { /** * Returns a promise for all the URLs in the {@code nodes} and the direct * children of {@code nodes}. - * @param {!Array.<BookmarkTreeNode>} nodes . - * @return {!Promise.<Array.<string>>} . + * @param {!Array<BookmarkTreeNode>} nodes . + * @return {!Promise<Array<string>>} . */ function getAllUrls(nodes) { var urls = []; @@ -346,7 +346,7 @@ function getAllUrls(nodes) { /** * Returns the nodes (non recursive) to use for the open commands. * @param {HTMLElement} target - * @return {!Array.<BookmarkTreeNode>} + * @return {!Array<BookmarkTreeNode>} */ function getNodesForOpen(target) { if (target == bmm.tree) { @@ -371,7 +371,7 @@ function getNodesForOpen(target) { * Returns a promise that will contain all URLs of all the selected bookmarks * and the nested bookmarks for use with the open commands. * @param {HTMLElement} target The target list or tree. - * @return {Promise.<Array.<string>>} . + * @return {Promise<Array<string>>} . */ function getUrlsForOpenCommands(target) { return getAllUrls(getNodesForOpen(target)); @@ -847,7 +847,7 @@ function getSelectedBookmarkNodes(opt_target) { /** * @param {EventTarget=} opt_target The target list or tree. - * @return {!Array.<string>} An array of the selected bookmark IDs. + * @return {!Array<string>} An array of the selected bookmark IDs. */ function getSelectedBookmarkIds(opt_target) { var selectedNodes = getSelectedBookmarkNodes(opt_target); @@ -866,7 +866,7 @@ function isUnmodifiable(node) { } /** - * @param {Array.<BookmarkTreeNode>} nodes A list of BookmarkTreeNodes. + * @param {Array<BookmarkTreeNode>} nodes A list of BookmarkTreeNodes. * @return {boolean} Whether any of the nodes is managed. */ function hasUnmodifiable(nodes) { @@ -1225,7 +1225,7 @@ function hasSelectedAncestor(parentNode) { /** * @param {EventTarget=} opt_target A target to get bookmark IDs from. - * @return {Array.<string>} An array of bookmarks IDs. + * @return {Array<string>} An array of bookmarks IDs. */ function getFilteredSelectedBookmarkIds(opt_target) { // Remove duplicates from filteredIds and return. diff --git a/chrome/browser/resources/chromeos/braille_ime/braille_ime.js b/chrome/browser/resources/chromeos/braille_ime/braille_ime.js index 7074691..a0f5758 100644 --- a/chrome/browser/resources/chromeos/braille_ime/braille_ime.js +++ b/chrome/browser/resources/chromeos/braille_ime/braille_ime.js @@ -108,7 +108,7 @@ BrailleIme.prototype = { * Note that the mapping below is arranged like the dots in a braille cell. * Only 6 dot input is supported. * @private - * @const {Object.<string, number>} + * @const {Object<string, number>} */ CODE_TO_DOT_: {'KeyF': 0x01, 'KeyJ': 0x08, 'KeyD': 0x02, 'KeyK': 0x10, diff --git a/chrome/browser/resources/chromeos/device_log_ui/device_log_ui.js b/chrome/browser/resources/chromeos/device_log_ui/device_log_ui.js index 840b4f4..a562ed7 100644 --- a/chrome/browser/resources/chromeos/device_log_ui/device_log_ui.js +++ b/chrome/browser/resources/chromeos/device_log_ui/device_log_ui.js @@ -76,7 +76,7 @@ var DeviceLogUI = (function() { /** * Creates event log entries. * - * @param {Array.<string>} logEntries An array of strings that represent log + * @param {Array<string>} logEntries An array of strings that represent log * log events in JSON format. */ var createEventLog = function(logEntries) { diff --git a/chrome/browser/resources/chromeos/keyboard_overlay_data.js b/chrome/browser/resources/chromeos/keyboard_overlay_data.js index 5c9cf0c..45485c8 100644 --- a/chrome/browser/resources/chromeos/keyboard_overlay_data.js +++ b/chrome/browser/resources/chromeos/keyboard_overlay_data.js @@ -15775,9 +15775,9 @@ var keyboardOverlayData = { '-<>CTRL': 'keyboardOverlayZoomOut', '-<>CTRL<>SHIFT': 'keyboardOverlayZoomScreenOut', '-<>SEARCH': 'keyboardOverlayF11', - '.<>ALT<>CTRL': 'keyboardOverlayNextUser', - '.<>CTRL<>SHIFT': 'keyboardOverlayToggleSpeechInput', - '.<>SEARCH': 'keyboardOverlayInsert', + '<>ALT<>CTRL': 'keyboardOverlayNextUser', + '<>CTRL<>SHIFT': 'keyboardOverlayToggleSpeechInput', + '<>SEARCH': 'keyboardOverlayInsert', '/<>ALT<>CTRL': 'keyboardOverlayViewKeyboardOverlay', '/<>ALT<>CTRL<>SHIFT': 'keyboardOverlayViewKeyboardOverlay', '/<>CTRL': 'keyboardOverlayHelp', diff --git a/chrome/browser/resources/chromeos/login/apps_menu.js b/chrome/browser/resources/chromeos/login/apps_menu.js index 37fa769..d60dce3 100644 --- a/chrome/browser/resources/chromeos/login/apps_menu.js +++ b/chrome/browser/resources/chromeos/login/apps_menu.js @@ -144,7 +144,7 @@ cr.define('login', function() { /** * Sets apps to be displayed in the apps menu. - * @param {!Array.<!Object>} apps An array of app info objects. + * @param {!Array<!Object>} apps An array of app info objects. */ AppsMenuButton.setApps = function(apps) { $('show-apps-button').data = apps; diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js index 28cc8d5..96e0bf6 100644 --- a/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js +++ b/chrome/browser/resources/chromeos/login/oobe_screen_user_image.js @@ -305,7 +305,7 @@ login.createScreen('UserImageScreen', 'user-image', function() { /** * Appends default images to the image grid. Should only be called once. - * @param {Array.<{url: string, author: string, website: string}>} images + * @param {Array<{url: string, author: string, website: string}>} images * An array of default images data, including URL, author and website. */ setDefaultImages: function(imagesData) { diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.js b/chrome/browser/resources/chromeos/login/screen_error_message.js index 98686d2..561f6ff 100644 --- a/chrome/browser/resources/chromeos/login/screen_error_message.js +++ b/chrome/browser/resources/chromeos/login/screen_error_message.js @@ -204,7 +204,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() { var ellipsis = ''; for (var i = 1; i <= 3; ++i) { ellipsis += - '<span id="connecting-indicator-ellipsis-' + i + '">.</span>'; + '<span id="connecting-indicator-ellipsis-' + i + '"></span>'; } $('connecting-indicator').innerHTML = loadTimeData.getStringF('connectingIndicatorText', ellipsis); diff --git a/chrome/browser/resources/chromeos/network_configuration/js/network_status.js b/chrome/browser/resources/chromeos/network_configuration/js/network_status.js index 8fa37d9..e712752 100644 --- a/chrome/browser/resources/chromeos/network_configuration/js/network_status.js +++ b/chrome/browser/resources/chromeos/network_configuration/js/network_status.js @@ -24,10 +24,10 @@ cr.define('network.status', function() { /** * Calculates both set difference of |a| and |b| and returns them in an array: * [ a - b, b - a ]. - * @param {Array.<T>} a . - * @param {Array.<T>} b . + * @param {Array<T>} a . + * @param {Array<T>} b . * @param {function(T): K} toKey . - * @return {Array.<Array.<T>>} . + * @return {Array<Array<T>>} . */ function differenceBy(a, b, toKey) { var inA = {}; @@ -72,9 +72,9 @@ cr.define('network.status', function() { /** * Creates a map of the entries of |array|. Each entry is associated to the * key getKey(entry). - * @param {Array.<T>} array . + * @param {Array<T>} array . * @param {function(T): K} getKey . - * @return {Object.<K, T>} . + * @return {Object<K, T>} . */ function createMapFromList(array, getKey) { var result = {}; @@ -87,8 +87,8 @@ cr.define('network.status', function() { /** * Wraps each entry in |array| into an array. The result contains rows with * one entry each. - * @param {Array.<T>} array . - * @return {Array.<Array.<T>>} . + * @param {Array<T>} array . + * @return {Array<Array<T>>} . */ function arrayToTable(array) { return array.map(function(e) { @@ -232,7 +232,7 @@ cr.define('network.status', function() { /** * Returns the list of identifiers for which nested buttons will be created. * To be overridden by subclasses. - * @return {Array.<string>} . + * @return {Array<string>} . */ getEntries: function() { return []; @@ -410,9 +410,9 @@ cr.define('network.status', function() { /** * Groups networks by type. - * @param {Object.<string, Object>} networkByID A map from network ID to + * @param {Object<string, Object>} networkByID A map from network ID to * network properties. - * @return {Object.<string, Array.<string>>} A map from network type to the + * @return {Object<string, Array<string>>} A map from network type to the * list of IDs of networks of that type. */ function createNetworkIDsByType(networkByID) { @@ -454,26 +454,26 @@ cr.define('network.status', function() { /** * The set of technologies shown to the user. - * @type {Object.<string, boolean>} + * @type {Object<string, boolean>} */ this.technologies_ = {}; /** * A map from network type to the array of IDs of network of that type. - * @type {Object.<string, Array.<string>>} + * @type {Object<string, Array<string>>} */ this.networkIDsByType_ = {}; /** * A map from network ID to the network's properties. - * @type {Object.<string, Object>} + * @type {Object<string, Object>} */ this.networkByID_ = {}; /** * A map from network ID to the network's position in the last received * network list. - * @type {Object.<string, number>} + * @type {Object<string, number>} */ this.networkIndexByID_ = {}; @@ -533,7 +533,7 @@ cr.define('network.status', function() { /** * @param {string} technology . - * @return {Array.<string>} Array of network IDs. + * @return {Array<string>} Array of network IDs. */ getNetworkIDsOfType: function(technology) { var networkIDs = this.networkIDsByType_[technology]; @@ -599,7 +599,7 @@ cr.define('network.status', function() { }, /** - * @param {Array.<string>} networkIDs . + * @param {Array<string>} networkIDs . */ updateIndexes_: function(networkIDs) { var newNetworkIndexByID = {}; @@ -610,7 +610,7 @@ cr.define('network.status', function() { }, /** - * @param {Array.<string>} networkIDs . + * @param {Array<string>} networkIDs . */ onNetworkListChanged_: function(networkIDs) { var diff = differenceBy(Object.keys(this.networkByID_), @@ -635,7 +635,7 @@ cr.define('network.status', function() { }, /** - * @param {Array.<string>} networkIDs . + * @param {Array<string>} networkIDs . */ onNetworksChanged_: function(networkIDs) { var updateCallback = this.updateNetworkCallback_.bind(this); @@ -662,7 +662,7 @@ cr.define('network.status', function() { }, /** - * @param {Array.<Object>} networks . + * @param {Array<Object>} networks . */ setVisibleNetworks: function(networks) { this.networkByID_ = createMapFromList( diff --git a/chrome/browser/resources/chromeos/power.js b/chrome/browser/resources/chromeos/power.js index 3249e86..98c38de 100644 --- a/chrome/browser/resources/chromeos/power.js +++ b/chrome/browser/resources/chromeos/power.js @@ -9,9 +9,9 @@ * drawn. * @param {HTMLCanvasElement} legendCanvas The canvas on which the legend for * the line graph is drawn. - * @param {Array.<number>} tData The time (in seconds) in the past when the + * @param {Array<number>} tData The time (in seconds) in the past when the * corresponding data in plots was sampled. - * @param {Array.<{data: Array.<number>, color: string}>} plots An + * @param {Array<{data: Array<number>, color: string}>} plots An * array of plots to plot on the canvas. The field 'data' of a plot is an * array of samples to be plotted as a line graph with color speficied by * the field 'color'. The elements in the 'data' array are ordered @@ -397,7 +397,7 @@ var plotColors = ['Red', 'Blue', 'Green', 'Gold', 'CadetBlue', 'LightCoral', * Add canvases for plotting to |plotsDiv|. For every header in |headerArray|, * one canvas for the plot and one for its legend are added. * - * @param {Array.<string>} headerArray Headers for the different plots to be + * @param {Array<string>} headerArray Headers for the different plots to be * added to |plotsDiv|. * @param {HTMLDivElement} plotsDiv The div element into which the canvases * are added. @@ -443,22 +443,23 @@ function addCanvases(headerArray, plotsDiv) { * resumed from a sleep/suspend, then "suspended" sleep samples are added to * the plot for the sleep duration. * - * @param {Array.<{data: Array.<number>, color: string}>} plots An + * @param {Array<{data: Array<number>, color: string}>} plots An * array of plots to plot on the canvas. The field 'data' of a plot is an * array of samples to be plotted as a line graph with color speficied by * the field 'color'. The elements in the 'data' array are ordered * corresponding to their sampling time in the argument 'tData'. Also, the * number of elements in the 'data' array should be the same as in the time * array 'tData' below. - * @param {Array.<number>} tData The time (in seconds) in the past when the + * @param {Array<number>} tData The time (in seconds) in the past when the * corresponding data in plots was sampled. - * @param {Array.<number>} sampleArray The array of samples wherein each + * @param {Array<number>} absTime + * @param {Array<number>} sampleArray The array of samples wherein each * element corresponds to the individual plot in |plots|. * @param {number} sampleTime Time in milliseconds since the epoch when the * samples in |sampleArray| were captured. * @param {number} previousSampleTime Time in milliseconds since the epoch * when the sample prior to the current sample was captured. - * @param {Array.<{time: number, sleepDuration: number}>} systemResumedArray An + * @param {Array<{time: number, sleepDuration: number}>} systemResumedArray An * array objects corresponding to system resume events. The 'time' field is * for the time in milliseconds since the epoch when the system resumed. The * 'sleepDuration' field is for the time in milliseconds the system spent @@ -519,14 +520,14 @@ function addTimeDataSample(plots, tData, absTime, sampleArray, /** * Display the battery charge vs time on a line graph. * - * @param {Array.<{time: number, + * @param {Array<{time: number, * batteryPercent: number, * batteryDischargeRate: number, * externalPower: number}>} powerSupplyArray An array of objects * with fields representing the battery charge, time when the charge * measurement was taken, and whether there was external power connected at * that time. - * @param {Array.<{time: ?, sleepDuration: ?}>} systemResumedArray An array + * @param {Array<{time: ?, sleepDuration: ?}>} systemResumedArray An array * objects with fields 'time' and 'sleepDuration'. Each object corresponds * to a system resume event. The 'time' field is for the time in * milliseconds since the epoch when the system resumed. The 'sleepDuration' @@ -649,13 +650,13 @@ function showBatteryChargeData(powerSupplyArray, systemResumedArray) { * Shows state occupancy data (CPU idle or CPU freq state occupancy) on a set of * plots on the about:power UI. * - * @param {Array.<{Array.<{ + * @param {Array<Array<{ * time: number, - * cpuOnline:boolean, - * timeInState: {<string>: number}>}>} timeInStateData Array of arrays + * cpuOnline: boolean, + * timeInState: Object<number>}>} timeInStateData Array of arrays * where each array corresponds to a CPU on the system. The elements of the * individual arrays contain state occupancy samples. - * @param {Array.<{time: ?, sleepDuration: ?}>} systemResumedArray An array + * @param {Array<{time: ?, sleepDuration: ?}>} systemResumedArray An array * objects with fields 'time' and 'sleepDuration'. Each object corresponds * to a system resume event. The 'time' field is for the time in * milliseconds since the epoch when the system resumed. The 'sleepDuration' diff --git a/chrome/browser/resources/chromeos/provided_file_systems.js b/chrome/browser/resources/chromeos/provided_file_systems.js index d38efd4..007bf00 100644 --- a/chrome/browser/resources/chromeos/provided_file_systems.js +++ b/chrome/browser/resources/chromeos/provided_file_systems.js @@ -46,7 +46,7 @@ Polymer('file-systems', { /** * List of provided file system information maps. - * @type {Array.<Object>} + * @type {Array<Object>} */ model: [] }); @@ -106,7 +106,7 @@ Polymer('request-events', { /** * List of events. - * @type {Array.<Object>} + * @type {Array<Object>} */ model: [] }); @@ -129,7 +129,7 @@ Polymer('request-timeline', { /** * Observes changes in the model. - * @type {Object.<string, string>} + * @type {Object<string, string>} */ observe: { 'model.length': 'chartUpdate' @@ -317,26 +317,26 @@ Polymer('request-timeline', { /** * Map of selected requests. - * @type {Object.<number, boolean>} + * @type {Object<number, boolean>} */ selected: {}, /** * Map of requests which has started, but are not completed yet, from * a request id to the chart element index. - * @type {Object.<number, number>}} + * @type {Object<number, number>}} */ active: {}, /** * List of chart elements, calculated from the model. - * @type {Array.<Object>} + * @type {Array<Object>} */ chart: [], /** * List of rows in the chart, with the last endTime value on it. - * @type {Array.<Object>} + * @type {Array<Object>} */ rows: [], @@ -367,14 +367,14 @@ Polymer('request-timeline', { /** * List of requests information maps. - * @type {Array.<Object>} + * @type {Array<Object>} */ model: [] }); /* * Updates the mounted file system list. - * @param {Array.<Object>} fileSystems Array containing provided file system + * @param {Array<Object>} fileSystems Array containing provided file system * information. */ function updateFileSystems(fileSystems) { diff --git a/chrome/browser/resources/chromeos/user_images_grid.js b/chrome/browser/resources/chromeos/user_images_grid.js index c64623a..aaecf7a 100644 --- a/chrome/browser/resources/chromeos/user_images_grid.js +++ b/chrome/browser/resources/chromeos/user_images_grid.js @@ -639,7 +639,7 @@ cr.define('options', function() { /** * Appends default images to the image grid. Should only be called once. - * @param {Array.<{url: string, author: string, + * @param {Array<{url: string, author: string, * website: string, title: string}>} imagesData * An array of default images data, including URL, author, title and * website. diff --git a/chrome/browser/resources/cryptotoken/appid.js b/chrome/browser/resources/cryptotoken/appid.js index fcaafac..f76012c 100644 --- a/chrome/browser/resources/cryptotoken/appid.js +++ b/chrome/browser/resources/cryptotoken/appid.js @@ -10,7 +10,7 @@ /** * Parses the text as JSON and returns it as an array of strings. * @param {string} text Input JSON - * @return {!Array.<string>} Array of origins + * @return {!Array<string>} Array of origins */ function getOriginsFromJson(text) { try { @@ -31,8 +31,8 @@ function getOriginsFromJson(text) { /** * Retrieves a set of distinct app ids from the sign challenges. - * @param {Array.<SignChallenge>=} signChallenges Input sign challenges. - * @return {Array.<string>} array of distinct app ids. + * @param {Array<SignChallenge>=} signChallenges Input sign challenges. + * @return {Array<string>} array of distinct app ids. */ function getDistinctAppIds(signChallenges) { if (!signChallenges) { @@ -53,7 +53,7 @@ function getDistinctAppIds(signChallenges) { * @param {!TextFetcher} fetcher A URL fetcher. * @param {!Countdown} timer A timer by which to resolve all provided app ids. * @param {string} origin The origin to check. - * @param {!Array.<string>} appIds The app ids to check. + * @param {!Array<string>} appIds The app ids to check. * @param {boolean} allowHttp Whether to allow http:// URLs. * @param {string=} opt_logMsgUrl A log message URL. * @constructor @@ -72,7 +72,7 @@ function AppIdChecker(fetcher, timer, origin, appIds, allowHttp, opt_logMsgUrl) appIdsMap[appIds[i]] = appIds[i]; } } - /** @private {Array.<string>} */ + /** @private {Array<string>} */ this.distinctAppIds_ = Object.keys(appIdsMap); /** @private {boolean} */ this.allowHttp_ = allowHttp; @@ -89,7 +89,7 @@ function AppIdChecker(fetcher, timer, origin, appIds, allowHttp, opt_logMsgUrl) /** * Checks whether all the app ids provided can be asserted by the given origin. - * @return {Promise.<boolean>} A promise for the result of the check + * @return {Promise<boolean>} A promise for the result of the check */ AppIdChecker.prototype.doCheck = function() { if (!this.distinctAppIds_.length) @@ -115,7 +115,7 @@ AppIdChecker.prototype.doCheck = function() { /** * Checks if a single appId can be asserted by the given origin. * @param {string} appId The appId to check - * @return {Promise.<boolean>} A promise for the result of the check + * @return {Promise<boolean>} A promise for the result of the check * @private */ AppIdChecker.prototype.checkAppId_ = function(appId) { @@ -157,7 +157,7 @@ AppIdChecker.prototype.allAppIdsEqualOrigin_ = function() { /** * Fetches the allowed origins for an appId. * @param {string} appId Application id - * @return {Promise.<!Array.<string>>} A promise for a list of allowed origins + * @return {Promise<!Array<string>>} A promise for a list of allowed origins * for appId * @private */ diff --git a/chrome/browser/resources/cryptotoken/approvedorigins.js b/chrome/browser/resources/cryptotoken/approvedorigins.js index f1027c1..41c854a 100644 --- a/chrome/browser/resources/cryptotoken/approvedorigins.js +++ b/chrome/browser/resources/cryptotoken/approvedorigins.js @@ -22,6 +22,6 @@ function ApprovedOrigins() {} * @param {string} origin The origin to approve. * @param {number=} opt_tabId A tab id to display approval prompt in, if * necessary. - * @return {Promise.<boolean>} A promise for the result of the check. + * @return {Promise<boolean>} A promise for the result of the check. */ ApprovedOrigins.prototype.isApprovedOrigin = function(origin, opt_tabId) {}; diff --git a/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js b/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js index 89fc759..8b4f838 100644 --- a/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js +++ b/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js @@ -25,7 +25,7 @@ function CryptoTokenApprovedOrigin() {} * @param {number=} opt_tabId A tab id to display approval prompt in. * For this implementation, the tabId is always necessary, even though * the type allows undefined. - * @return {Promise.<boolean>} A promise for the result of the check. + * @return {Promise<boolean>} A promise for the result of the check. */ CryptoTokenApprovedOrigin.prototype.isApprovedOrigin = function(origin, opt_tabId) { diff --git a/chrome/browser/resources/cryptotoken/cryptotokenorigincheck.js b/chrome/browser/resources/cryptotoken/cryptotokenorigincheck.js index dec9532..3e4ac5e 100644 --- a/chrome/browser/resources/cryptotoken/cryptotokenorigincheck.js +++ b/chrome/browser/resources/cryptotoken/cryptotokenorigincheck.js @@ -22,8 +22,8 @@ function CryptoTokenOriginChecker() { /** * Checks whether the origin is allowed to claim the app ids. * @param {string} origin The origin claiming the app id. - * @param {!Array.<string>} appIds The app ids being claimed. - * @return {Promise.<boolean>} A promise for the result of the check. + * @param {!Array<string>} appIds The app ids being claimed. + * @return {Promise<boolean>} A promise for the result of the check. */ CryptoTokenOriginChecker.prototype.canClaimAppIds = function(origin, appIds) { var appIdChecks = appIds.map(this.checkAppId_.bind(this, origin)); @@ -38,7 +38,7 @@ CryptoTokenOriginChecker.prototype.canClaimAppIds = function(origin, appIds) { * Checks if a single appId can be asserted by the given origin. * @param {string} origin The origin. * @param {string} appId The appId to check - * @return {Promise.<boolean>} A promise for the result of the check + * @return {Promise<boolean>} A promise for the result of the check * @private */ CryptoTokenOriginChecker.prototype.checkAppId_ = diff --git a/chrome/browser/resources/cryptotoken/enroller.js b/chrome/browser/resources/cryptotoken/enroller.js index ebc7f58..57706a1 100644 --- a/chrome/browser/resources/cryptotoken/enroller.js +++ b/chrome/browser/resources/cryptotoken/enroller.js @@ -215,7 +215,7 @@ function isValidEnrollRequest(request, enrollChallengesName, var EnrollChallenge; /** - * @param {Array.<EnrollChallenge>} enrollChallenges The enroll challenges to + * @param {Array<EnrollChallenge>} enrollChallenges The enroll challenges to * validate. * @param {boolean} appIdRequired Whether the appId property is required on * each challenge. @@ -253,7 +253,7 @@ function isValidEnrollChallengeArray(enrollChallenges, appIdRequired) { /** * Finds the enroll challenge of the given version in the enroll challlenge * array. - * @param {Array.<EnrollChallenge>} enrollChallenges The enroll challenges to + * @param {Array<EnrollChallenge>} enrollChallenges The enroll challenges to * search. * @param {string} version Version to search for. * @return {?EnrollChallenge} The enroll challenge with the given versions, or @@ -307,7 +307,7 @@ function makeEnrollResponseData(enrollChallenge, u2fVersion, enrollDataName, * the request. * @param {string=} opt_registeredKeysName The name of the registered keys * value in the request. - * @return {Array.<SignChallenge>} + * @return {Array<SignChallenge>} */ function getSignRequestsFromEnrollRequest(request, signChallengesName, opt_registeredKeysName) { @@ -356,11 +356,11 @@ function Enroller(timer, sender, errorCb, successCb, opt_logMsgUrl) { /** @private {boolean} */ this.done_ = false; - /** @private {Object.<string, string>} */ + /** @private {Object<string, string>} */ this.browserData_ = {}; - /** @private {Array.<EnrollHelperChallenge>} */ + /** @private {Array<EnrollHelperChallenge>} */ this.encodedEnrollChallenges_ = []; - /** @private {Array.<SignHelperChallenge>} */ + /** @private {Array<SignHelperChallenge>} */ this.encodedSignChallenges_ = []; // Allow http appIds for http origins. (Broken, but the caller deserves // what they get.) @@ -378,16 +378,16 @@ Enroller.DEFAULT_TIMEOUT_MILLIS = 30 * 1000; /** * Performs an enroll request with the given enroll and sign challenges. - * @param {Array.<EnrollChallenge>} enrollChallenges A set of enroll challenges. - * @param {Array.<SignChallenge>} signChallenges A set of sign challenges for + * @param {Array<EnrollChallenge>} enrollChallenges A set of enroll challenges. + * @param {Array<SignChallenge>} signChallenges A set of sign challenges for * existing enrollments for this user and appId. * @param {string=} opt_appId The app id for the entire request. */ Enroller.prototype.doEnroll = function(enrollChallenges, signChallenges, opt_appId) { - /** @private {Array.<EnrollChallenge>} */ + /** @private {Array<EnrollChallenge>} */ this.enrollChallenges_ = enrollChallenges; - /** @private {Array.<SignChallenge>} */ + /** @private {Array<SignChallenge>} */ this.signChallenges_ = signChallenges; /** @private {(string|undefined)} */ this.appId_ = opt_appId; @@ -531,9 +531,9 @@ Enroller.encodeEnrollChallenge_ = function(enrollChallenge, opt_appId) { /** * Encodes the given enroll challenges using this enroller's state. - * @param {Array.<EnrollChallenge>} enrollChallenges The enroll challenges. + * @param {Array<EnrollChallenge>} enrollChallenges The enroll challenges. * @param {string=} opt_appId The app id for the entire request. - * @return {!Array.<EnrollHelperChallenge>} The encoded enroll challenges. + * @return {!Array<EnrollHelperChallenge>} The encoded enroll challenges. * @private */ Enroller.prototype.encodeEnrollChallenges_ = function(enrollChallenges, @@ -576,7 +576,7 @@ Enroller.prototype.encodeEnrollChallenges_ = function(enrollChallenges, /** * Checks the app ids associated with this enroll request, and calls a callback * with the result of the check. - * @param {!Array.<string>} enrollAppIds The app ids in the enroll challenge + * @param {!Array<string>} enrollAppIds The app ids in the enroll challenge * portion of the enroll request. * @param {function(boolean)} cb Called with the result of the check. * @private @@ -593,7 +593,7 @@ Enroller.prototype.checkAppIds_ = function(enrollAppIds, cb) { * Called with the result of checking the origin. When the origin is allowed * to claim the app ids, begins checking whether the app ids also list the * origin. - * @param {!Array.<string>} appIds The app ids. + * @param {!Array<string>} appIds The app ids. * @param {function(boolean)} cb Called with the result of the check. * @param {boolean} result Whether the origin could claim the app ids. * @private diff --git a/chrome/browser/resources/cryptotoken/generichelper.js b/chrome/browser/resources/cryptotoken/generichelper.js index cbd35a2..2944610 100644 --- a/chrome/browser/resources/cryptotoken/generichelper.js +++ b/chrome/browser/resources/cryptotoken/generichelper.js @@ -20,7 +20,7 @@ var RequestHandlerFactory; * @implements {RequestHelper} */ function GenericRequestHelper() { - /** @private {Object.<string, RequestHandlerFactory>} */ + /** @private {Object<string, RequestHandlerFactory>} */ this.handlerFactories_ = {}; } diff --git a/chrome/browser/resources/cryptotoken/gnubbies.js b/chrome/browser/resources/cryptotoken/gnubbies.js index a1b3030..2425cad 100644 --- a/chrome/browser/resources/cryptotoken/gnubbies.js +++ b/chrome/browser/resources/cryptotoken/gnubbies.js @@ -30,20 +30,20 @@ var GnubbyNamespaceImpl; * @constructor */ function Gnubbies() { - /** @private {Object.<string, Array>} */ + /** @private {Object<string, Array>} */ this.devs_ = {}; this.pendingEnumerate = []; // clients awaiting an enumerate /** * The distinct namespaces registered in this Gnubbies instance, in order of * registration. - * @private {Array.<string>} + * @private {Array<string>} */ this.namespaces_ = []; - /** @private {Object.<string, GnubbyNamespaceImpl>} */ + /** @private {Object<string, GnubbyNamespaceImpl>} */ this.impl_ = {}; - /** @private {Object.<string, Object.<number, !GnubbyDevice>>} */ + /** @private {Object<string, Object<number, !GnubbyDevice>>} */ this.openDevs_ = {}; - /** @private {Object.<string, Object.<number, *>>} */ + /** @private {Object<string, Object<number, *>>} */ this.pendingOpens_ = {}; // clients awaiting an open } @@ -97,7 +97,7 @@ Gnubbies.prototype.closeAll = function() { }; /** - * @param {function(number, Array.<GnubbyDeviceId>)} cb Called back with the + * @param {function(number, Array<GnubbyDeviceId>)} cb Called back with the * result of enumerating. */ Gnubbies.prototype.enumerate = function(cb) { @@ -126,7 +126,7 @@ Gnubbies.prototype.enumerate = function(cb) { /** * @param {string} namespace The namespace that was enumerated. - * @param {Array.<GnubbyDeviceId>} existingDeviceIds Previously enumerated + * @param {Array<GnubbyDeviceId>} existingDeviceIds Previously enumerated * device IDs (from other namespaces), if any. * @param {Array} devs The devices in the namespace. */ diff --git a/chrome/browser/resources/cryptotoken/gnubby-u2f.js b/chrome/browser/resources/cryptotoken/gnubby-u2f.js index d513415..a5ae8b5 100644 --- a/chrome/browser/resources/cryptotoken/gnubby-u2f.js +++ b/chrome/browser/resources/cryptotoken/gnubby-u2f.js @@ -35,8 +35,8 @@ Gnubby.U2F_V1 = 'U2F_V1'; Gnubby.U2F_V2 = 'U2F_V2'; /** Perform enrollment - * @param {Array.<number>|ArrayBuffer|Uint8Array} challenge Enrollment challenge - * @param {Array.<number>|ArrayBuffer|Uint8Array} appIdHash Hashed application + * @param {Array<number>|ArrayBuffer|Uint8Array} challenge Enrollment challenge + * @param {Array<number>|ArrayBuffer|Uint8Array} appIdHash Hashed application * id * @param {function(...)} cb Result callback * @param {boolean=} opt_individualAttestation Request the individual @@ -66,11 +66,11 @@ Gnubby.prototype.enroll = function(challenge, appIdHash, cb, }; /** Request signature - * @param {Array.<number>|ArrayBuffer|Uint8Array} challengeHash Hashed + * @param {Array<number>|ArrayBuffer|Uint8Array} challengeHash Hashed * signature challenge - * @param {Array.<number>|ArrayBuffer|Uint8Array} appIdHash Hashed application + * @param {Array<number>|ArrayBuffer|Uint8Array} appIdHash Hashed application * id - * @param {Array.<number>|ArrayBuffer|Uint8Array} keyHandle Key handle to use + * @param {Array<number>|ArrayBuffer|Uint8Array} keyHandle Key handle to use * @param {function(...)} cb Result callback * @param {boolean=} opt_nowink Request signature without winking * (e.g. during enroll) diff --git a/chrome/browser/resources/cryptotoken/gnubby.js b/chrome/browser/resources/cryptotoken/gnubby.js index cc9bc5a..8a05102 100644 --- a/chrome/browser/resources/cryptotoken/gnubby.js +++ b/chrome/browser/resources/cryptotoken/gnubby.js @@ -458,7 +458,7 @@ Gnubby.prototype.exchange_ = function(cmd, data, timeout, cb) { /** Default callback for commands. Simply logs to console. * @param {number} rc Result status code - * @param {(ArrayBuffer|Uint8Array|Array.<number>|null)} data Result data + * @param {(ArrayBuffer|Uint8Array|Array<number>|null)} data Result data */ Gnubby.defaultCallback = function(rc, data) { var msg = 'defaultCallback(' + rc; diff --git a/chrome/browser/resources/cryptotoken/gnubbydevice.js b/chrome/browser/resources/cryptotoken/gnubbydevice.js index a350ded..f7ef27f 100644 --- a/chrome/browser/resources/cryptotoken/gnubbydevice.js +++ b/chrome/browser/resources/cryptotoken/gnubbydevice.js @@ -121,7 +121,7 @@ var UsbDeviceSpec; /** * Gets the list of USB devices permitted by this app. - * @param {function(!Array.<!UsbDeviceSpec>)} cb Called back with a list of USB + * @param {function(!Array<!UsbDeviceSpec>)} cb Called back with a list of USB * device specifiers. */ GnubbyDevice.getPermittedUsbDevices = function(cb) { diff --git a/chrome/browser/resources/cryptotoken/gnubbyfactory.js b/chrome/browser/resources/cryptotoken/gnubbyfactory.js index 494602b..3879e91 100644 --- a/chrome/browser/resources/cryptotoken/gnubbyfactory.js +++ b/chrome/browser/resources/cryptotoken/gnubbyfactory.js @@ -15,7 +15,7 @@ function GnubbyFactory() {} /** * Enumerates gnubbies. - * @param {function(number, Array.<GnubbyDeviceId>)} cb Enumerate callback + * @param {function(number, Array<GnubbyDeviceId>)} cb Enumerate callback */ GnubbyFactory.prototype.enumerate = function(cb) { }; diff --git a/chrome/browser/resources/cryptotoken/multiplesigner.js b/chrome/browser/resources/cryptotoken/multiplesigner.js index 44bd797..1c4ffc2 100644 --- a/chrome/browser/resources/cryptotoken/multiplesigner.js +++ b/chrome/browser/resources/cryptotoken/multiplesigner.js @@ -52,7 +52,7 @@ function MultipleGnubbySigner(forEnroll, allCompleteCb, gnubbyCompleteCb, /** @private {string|undefined} */ this.logMsgUrl_ = opt_logMsgUrl; - /** @private {Array.<SignHelperChallenge>} */ + /** @private {Array<SignHelperChallenge>} */ this.challenges_ = []; /** @private {boolean} */ this.challengesSet_ = false; @@ -60,7 +60,7 @@ function MultipleGnubbySigner(forEnroll, allCompleteCb, gnubbyCompleteCb, this.complete_ = false; /** @private {number} */ this.numComplete_ = 0; - /** @private {!Object.<string, GnubbyTracker>} */ + /** @private {!Object<string, GnubbyTracker>} */ this.gnubbies_ = {}; /** @private {Countdown} */ this.timer_ = DEVICE_FACTORY_REGISTRY.getCountdownFactory() @@ -96,7 +96,7 @@ MultipleGnubbySigner.prototype.close = function() { /** * Begins signing the given challenges. - * @param {Array.<SignHelperChallenge>} challenges The challenges to sign. + * @param {Array<SignHelperChallenge>} challenges The challenges to sign. * @return {boolean} whether the challenges were successfully added. */ MultipleGnubbySigner.prototype.doSign = function(challenges) { @@ -148,7 +148,7 @@ MultipleGnubbySigner.prototype.enumerateGnubbies_ = function() { /** * Called with the result of enumerating gnubbies. * @param {number} rc The return code from enumerating. - * @param {Array.<GnubbyDeviceId>} ids The gnubbies enumerated. + * @param {Array<GnubbyDeviceId>} ids The gnubbies enumerated. * @private */ MultipleGnubbySigner.prototype.enumerateCallback_ = function(rc, ids) { diff --git a/chrome/browser/resources/cryptotoken/origincheck.js b/chrome/browser/resources/cryptotoken/origincheck.js index ddab33e..97077e0 100644 --- a/chrome/browser/resources/cryptotoken/origincheck.js +++ b/chrome/browser/resources/cryptotoken/origincheck.js @@ -20,7 +20,7 @@ function OriginChecker() {} /** * Checks whether the origin is allowed to claim the app ids. * @param {string} origin The origin claiming the app id. - * @param {!Array.<string>} appIds The app ids being claimed. - * @return {Promise.<boolean>} A promise for the result of the check. + * @param {!Array<string>} appIds The app ids being claimed. + * @return {Promise<boolean>} A promise for the result of the check. */ OriginChecker.prototype.canClaimAppIds = function(origin, appIds) {}; diff --git a/chrome/browser/resources/cryptotoken/requestqueue.js b/chrome/browser/resources/cryptotoken/requestqueue.js index 9c523ea..a377f4c 100644 --- a/chrome/browser/resources/cryptotoken/requestqueue.js +++ b/chrome/browser/resources/cryptotoken/requestqueue.js @@ -163,7 +163,7 @@ RequestQueue.prototype.queueRequest = function(beginCb, timer) { * @constructor */ function OriginKeyedRequestQueue() { - /** @private {Object.<string, !RequestQueue>} */ + /** @private {Object<string, !RequestQueue>} */ this.requests_ = {}; } diff --git a/chrome/browser/resources/cryptotoken/sha256.js b/chrome/browser/resources/cryptotoken/sha256.js index 4d3c93e..63b62fb 100644 --- a/chrome/browser/resources/cryptotoken/sha256.js +++ b/chrome/browser/resources/cryptotoken/sha256.js @@ -51,7 +51,7 @@ SHA256.prototype.reset = function() { }; /** Hash the next block of 64 bytes - * @param {Array.<number>} buf A 64 byte buffer + * @param {Array<number>} buf A 64 byte buffer */ SHA256.prototype._compress = function(buf) { var W = this._W; @@ -113,7 +113,7 @@ SHA256.prototype._compress = function(buf) { }; /** Update the hash with additional data - * @param {Array.<number>|Uint8Array} bytes The data + * @param {Array<number>|Uint8Array} bytes The data * @param {number=} opt_length How many bytes to hash, if not all */ SHA256.prototype.update = function(bytes, opt_length) { if (!opt_length) opt_length = bytes.length; @@ -129,7 +129,7 @@ SHA256.prototype.update = function(bytes, opt_length) { }; /** Update the hash with a specified range from a data buffer - * @param {Array.<number>} bytes The data buffer + * @param {Array<number>} bytes The data buffer * @param {number} start Starting index of the range in bytes * @param {number} end End index, will not be included in range */ @@ -148,7 +148,7 @@ SHA256.prototype.updateRange = function(bytes, start, end) { * Optionally update the hash with additional arguments, and return the * resulting hash value. * @param {...*} var_args Data buffers to hash - * @return {Array.<number>} the SHA256 hash value. + * @return {Array<number>} the SHA256 hash value. */ SHA256.prototype.digest = function(var_args) { for (var i = 0; i < arguments.length; ++i) diff --git a/chrome/browser/resources/cryptotoken/signer.js b/chrome/browser/resources/cryptotoken/signer.js index 9397670..df91d39 100644 --- a/chrome/browser/resources/cryptotoken/signer.js +++ b/chrome/browser/resources/cryptotoken/signer.js @@ -223,7 +223,7 @@ function isValidSignRequest(request, signChallengesName) { /** * Adapter class representing a queued sign request. - * @param {!Array.<SignChallenge>} signChallenges The sign challenges. + * @param {!Array<SignChallenge>} signChallenges The sign challenges. * @param {Countdown} timer Timeout timer * @param {WebRequestSender} sender Message sender. * @param {function(U2fError)} errorCb Error callback @@ -237,7 +237,7 @@ function isValidSignRequest(request, signChallengesName) { */ function QueuedSignRequest(signChallenges, timer, sender, errorCb, successCb, opt_defaultChallenge, opt_appId, opt_logMsgUrl) { - /** @private {!Array.<SignChallenge>} */ + /** @private {!Array<SignChallenge>} */ this.signChallenges_ = signChallenges; /** @private {Countdown} */ this.timer_ = timer.clone(this.close.bind(this)); @@ -361,9 +361,9 @@ function Signer(timer, sender, errorCb, successCb, opt_logMsgUrl) { /** @private {boolean} */ this.done_ = false; - /** @private {Object.<string, string>} */ + /** @private {Object<string, string>} */ this.browserData_ = {}; - /** @private {Object.<string, SignChallenge>} */ + /** @private {Object<string, SignChallenge>} */ this.serverChallenges_ = {}; // Allow http appIds for http origins. (Broken, but the caller deserves // what they get.) @@ -376,7 +376,7 @@ function Signer(timer, sender, errorCb, successCb, opt_logMsgUrl) { /** * Sets the challenges to be signed. - * @param {Array.<SignChallenge>} signChallenges The challenges to set. + * @param {Array<SignChallenge>} signChallenges The challenges to set. * @param {string=} opt_defaultChallenge A default sign challenge * value, if a request does not provide one. * @param {string=} opt_appId The app id for the entire request. @@ -390,7 +390,7 @@ Signer.prototype.setChallenges = function(signChallenges, opt_defaultChallenge, this.notifyError_({errorCode: ErrorCodes.TIMEOUT}); return true; } - /** @private {Array.<SignChallenge>} */ + /** @private {Array<SignChallenge>} */ this.signChallenges_ = signChallenges; /** @private {string|undefined} */ this.defaultChallenge_ = opt_defaultChallenge; @@ -429,7 +429,7 @@ Signer.prototype.checkAppIds_ = function() { * Called with the result of checking the origin. When the origin is allowed * to claim the app ids, begins checking whether the app ids also list the * origin. - * @param {!Array.<string>} appIds The app ids. + * @param {!Array<string>} appIds The app ids. * @param {boolean} result Whether the origin could claim the app ids. * @private */ @@ -445,7 +445,7 @@ Signer.prototype.originChecked_ = function(appIds, result) { /** @private {!AppIdChecker} */ this.appIdChecker_ = new AppIdChecker(FACTORY_REGISTRY.getTextFetcher(), this.timer_.clone(), this.sender_.origin, - /** @type {!Array.<string>} */ (appIds), this.allowHttp_, + /** @type {!Array<string>} */ (appIds), this.allowHttp_, this.logMsgUrl_); this.appIdChecker_.doCheck().then(this.appIdChecked_.bind(this)); }; diff --git a/chrome/browser/resources/cryptotoken/singlesigner.js b/chrome/browser/resources/cryptotoken/singlesigner.js index 9bcd065..692fd63 100644 --- a/chrome/browser/resources/cryptotoken/singlesigner.js +++ b/chrome/browser/resources/cryptotoken/singlesigner.js @@ -65,14 +65,14 @@ function SingleGnubbySigner(gnubbyId, forEnroll, completeCb, timer, /** @private {string|undefined} */ this.logMsgUrl_ = opt_logMsgUrl; - /** @private {!Array.<!SignHelperChallenge>} */ + /** @private {!Array<!SignHelperChallenge>} */ this.challenges_ = []; /** @private {number} */ this.challengeIndex_ = 0; /** @private {boolean} */ this.challengesSet_ = false; - /** @private {!Object.<string, number>} */ + /** @private {!Object<string, number>} */ this.cachedError_ = []; } @@ -138,7 +138,7 @@ SingleGnubbySigner.prototype.closed_ = function() { /** * Begins signing the given challenges. - * @param {Array.<SignHelperChallenge>} challenges The challenges to sign. + * @param {Array<SignHelperChallenge>} challenges The challenges to sign. * @return {boolean} Whether the challenges were accepted. */ SingleGnubbySigner.prototype.doSign = function(challenges) { diff --git a/chrome/browser/resources/cryptotoken/textfetcher.js b/chrome/browser/resources/cryptotoken/textfetcher.js index 4135b0e..d6e1884 100644 --- a/chrome/browser/resources/cryptotoken/textfetcher.js +++ b/chrome/browser/resources/cryptotoken/textfetcher.js @@ -19,7 +19,7 @@ function TextFetcher() {} * @param {string} url The URL to fetch. * @param {string?} opt_method The HTTP method to use (default GET) * @param {string?} opt_body The request body - * @return {!Promise.<string>} A promise for the fetched text. In case of an + * @return {!Promise<string>} A promise for the fetched text. In case of an * error, this promise is rejected with an HTTP status code. */ TextFetcher.prototype.fetch = function(url, opt_method, opt_body) {}; @@ -35,7 +35,7 @@ function XhrTextFetcher() { * @param {string} url The URL to fetch. * @param {string?} opt_method The HTTP method to use (default GET) * @param {string?} opt_body The request body - * @return {!Promise.<string>} A promise for the fetched text. In case of an + * @return {!Promise<string>} A promise for the fetched text. In case of an * error, this promise is rejected with an HTTP status code. */ XhrTextFetcher.prototype.fetch = function(url, opt_method, opt_body) { diff --git a/chrome/browser/resources/cryptotoken/usbenrollhandler.js b/chrome/browser/resources/cryptotoken/usbenrollhandler.js index 55f5d06..ce906c7 100644 --- a/chrome/browser/resources/cryptotoken/usbenrollhandler.js +++ b/chrome/browser/resources/cryptotoken/usbenrollhandler.js @@ -16,7 +16,7 @@ function UsbEnrollHandler(request) { /** @private {!EnrollHelperRequest} */ this.request_ = request; - /** @private {Array.<Gnubby>} */ + /** @private {Array<Gnubby>} */ this.waitingForTouchGnubbies_ = []; /** @private {boolean} */ diff --git a/chrome/browser/resources/cryptotoken/usbgnubbydevice.js b/chrome/browser/resources/cryptotoken/usbgnubbydevice.js index 91c0dd1..82ca2f4 100644 --- a/chrome/browser/resources/cryptotoken/usbgnubbydevice.js +++ b/chrome/browser/resources/cryptotoken/usbgnubbydevice.js @@ -436,7 +436,7 @@ var InterfaceEndpoint; * interfaceSubclass: number, * interfaceProtocol: number, * description: (string|undefined), - * endpoints: !Array.<!InterfaceEndpoint> + * endpoints: !Array<!InterfaceEndpoint> * }} * @see http://developer.chrome.com/apps/usb.html#method-listInterfaces */ diff --git a/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js b/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js index 4d32712..c28433b 100644 --- a/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js +++ b/chrome/browser/resources/cryptotoken/usbgnubbyfactory.js @@ -43,7 +43,7 @@ UsbGnubbyFactory.prototype.openGnubby = /** * Enumerates gnubbies. - * @param {function(number, Array.<GnubbyDeviceId>)} cb Enumerate callback + * @param {function(number, Array<GnubbyDeviceId>)} cb Enumerate callback */ UsbGnubbyFactory.prototype.enumerate = function(cb) { this.gnubbies_.enumerate(cb); diff --git a/chrome/browser/resources/cryptotoken/usbsignhandler.js b/chrome/browser/resources/cryptotoken/usbsignhandler.js index 2fb8513..d06b529 100644 --- a/chrome/browser/resources/cryptotoken/usbsignhandler.js +++ b/chrome/browser/resources/cryptotoken/usbsignhandler.js @@ -22,7 +22,7 @@ function UsbSignHandler(request) { this.notified_ = false; /** @private {boolean} */ this.anyGnubbiesFound_ = false; - /** @private {!Array.<!Gnubby>} */ + /** @private {!Array<!Gnubby>} */ this.notEnrolledGnubbies_ = []; } @@ -167,7 +167,7 @@ UsbSignHandler.prototype.sendBogusEnroll_ = function(gnubby) { self.notifyError_(DeviceStatusCodes.INVALID_DATA_STATUS); } gnubby.enroll( - /** @type {Array.<number>} */ (enrollChallenge), + /** @type {Array<number>} */ (enrollChallenge), UsbSignHandler.BOGUS_APP_ID_HASH, self.enrollCallback_.bind(self, gnubby)); }); diff --git a/chrome/browser/resources/cryptotoken/util.js b/chrome/browser/resources/cryptotoken/util.js index b7c968b..9c2cb7a 100644 --- a/chrome/browser/resources/cryptotoken/util.js +++ b/chrome/browser/resources/cryptotoken/util.js @@ -21,7 +21,7 @@ function UTIL_StringToBytes(s, bytes) { /** * Converts a byte array to a string. - * @param {(Uint8Array|Array.<number>)} b input byte array. + * @param {(Uint8Array|Array<number>)} b input byte array. * @return {string} result. */ function UTIL_BytesToString(b) { @@ -30,7 +30,7 @@ function UTIL_BytesToString(b) { /** * Converts a byte array to a hex string. - * @param {(Uint8Array|Array.<number>)} b input byte array. + * @param {(Uint8Array|Array<number>)} b input byte array. * @return {string} result. */ function UTIL_BytesToHex(b) { @@ -165,8 +165,8 @@ var UTIL_ASN_SEQUENCE = 0x30; /** * Parse SEQ(INT, INT) from ASN1 byte array. - * @param {(Uint8Array|Array.<number>)} a input to parse from. - * @return {{'r': !Array.<number>, 's': !Array.<number>}|null} + * @param {(Uint8Array|Array<number>)} a input to parse from. + * @return {{'r': !Array<number>, 's': !Array<number>}|null} */ function UTIL_Asn1SignatureToJson(a) { if (a.length < 6) return null; // Too small to be valid @@ -194,7 +194,7 @@ function UTIL_Asn1SignatureToJson(a) { /** * Encode a JSON signature {r,s} as an ASN1 SEQ(INT, INT). May modify sig - * @param {{'r': (!Array.<number>|undefined), 's': !Array.<number>}} sig + * @param {{'r': (!Array<number>|undefined), 's': !Array<number>}} sig * @return {!Uint8Array} */ function UTIL_JsonSignatureToAsn1(sig) { diff --git a/chrome/browser/resources/cryptotoken/webrequest.js b/chrome/browser/resources/cryptotoken/webrequest.js index d336e42..ef2daf1 100644 --- a/chrome/browser/resources/cryptotoken/webrequest.js +++ b/chrome/browser/resources/cryptotoken/webrequest.js @@ -49,7 +49,7 @@ function isValidRegisteredKey(registeredKey, appIdRequired) { /** * Returns whether the array of registered keys appears to be valid. - * @param {Array.<Object>} registeredKeys The array of registered keys. + * @param {Array<Object>} registeredKeys The array of registered keys. * @param {boolean} appIdRequired Whether the appId property is required on * each challenge. * @return {boolean} Whether the array appears valid. @@ -62,7 +62,7 @@ function isValidRegisteredKeyArray(registeredKeys, appIdRequired) { /** * Returns whether the array of SignChallenges appears to be valid. - * @param {Array.<SignChallenge>} signChallenges The array of sign challenges. + * @param {Array<SignChallenge>} signChallenges The array of sign challenges. * @param {boolean} challengeValueRequired Whether each challenge object * requires a challenge value. * @param {boolean} appIdRequired Whether the appId property is required on @@ -316,7 +316,7 @@ function sendResponseOnce(sentResponse, closeable, response, sendResponse) { /** * @param {!string} string Input string - * @return {Array.<number>} SHA256 hash value of string. + * @return {Array<number>} SHA256 hash value of string. */ function sha256HashOfString(string) { var s = new SHA256(); @@ -409,7 +409,7 @@ function makeSignBrowserData(serverChallenge, origin, opt_tlsChannelId) { /** * Encodes the sign data as an array of sign helper challenges. - * @param {Array.<SignChallenge>} signChallenges The sign challenges to encode. + * @param {Array<SignChallenge>} signChallenges The sign challenges to encode. * @param {string|undefined} opt_defaultChallenge A default sign challenge * value, if a request does not provide one. * @param {string=} opt_defaultAppId The app id to use for each challenge, if @@ -418,7 +418,7 @@ function makeSignBrowserData(serverChallenge, origin, opt_tlsChannelId) { * A function that produces, from a key handle and a raw challenge, a hash * of the raw challenge. If none is provided, a default hash function is * used. - * @return {!Array.<SignHelperChallenge>} The sign challenges, encoded. + * @return {!Array<SignHelperChallenge>} The sign challenges, encoded. */ function encodeSignChallenges(signChallenges, opt_defaultChallenge, opt_defaultAppId, opt_challengeHashFunction) { @@ -458,7 +458,7 @@ function encodeSignChallenges(signChallenges, opt_defaultChallenge, /** * Makes a sign helper request from an array of challenges. - * @param {Array.<SignHelperChallenge>} challenges The sign challenges. + * @param {Array<SignHelperChallenge>} challenges The sign challenges. * @param {number=} opt_timeoutSeconds Timeout value. * @param {string=} opt_logMsgUrl URL to log to. * @return {SignHelperRequest} The sign helper request. diff --git a/chrome/browser/resources/cryptotoken/webrequestsender.js b/chrome/browser/resources/cryptotoken/webrequestsender.js index 7907120..96db4ca 100644 --- a/chrome/browser/resources/cryptotoken/webrequestsender.js +++ b/chrome/browser/resources/cryptotoken/webrequestsender.js @@ -136,7 +136,7 @@ function getTabIdWhenPossible(sender) { * Checks whether the given tab is in the foreground, i.e. is the active tab * of the focused window. * @param {number} tabId The tab id to check. - * @return {Promise.<boolean>} A promise for the result of the check. + * @return {Promise<boolean>} A promise for the result of the check. */ function tabInForeground(tabId) { return new Promise(function(resolve, reject) { diff --git a/chrome/browser/resources/downloads/downloads.js b/chrome/browser/resources/downloads/downloads.js index ab904b8..d2d767c 100644 --- a/chrome/browser/resources/downloads/downloads.js +++ b/chrome/browser/resources/downloads/downloads.js @@ -182,7 +182,7 @@ DownloadFocusRow.prototype = { */ function Downloads() { /** - * @type {!Object.<string, Download>} + * @type {!Object<string, Download>} * @private */ this.downloads_ = {}; @@ -1060,7 +1060,7 @@ function clearAll() { /** * Our history system calls this function with results from searches or when * downloads are added or removed. - * @param {Array.<Object>} results List of updates. + * @param {Array<Object>} results List of updates. */ function downloadsList(results) { if (downloads && downloads.isUpdateNeeded(results)) { @@ -1076,7 +1076,7 @@ function downloadsList(results) { /** * When a download is updated (progress, state change), this is called. - * @param {Array.<Object>} results List of updates for the download process. + * @param {Array<Object>} results List of updates for the download process. */ function downloadUpdated(results) { // Sometimes this can get called too early. diff --git a/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js b/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js index 28b0b3a..d927840 100644 --- a/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js +++ b/chrome/browser/resources/extensions/chromeos/kiosk_app_list.js @@ -53,7 +53,7 @@ cr.define('extensions', function() { /** * Loads the given list of apps. - * @param {!Array.<!Object>} apps An array of app info objects. + * @param {!Array<!Object>} apps An array of app info objects. */ setApps: function(apps) { this.dataModel = new ArrayDataModel(apps); diff --git a/chrome/browser/resources/extensions/chromeos/kiosk_apps.js b/chrome/browser/resources/extensions/chromeos/kiosk_apps.js index 3018708..4697bca 100644 --- a/chrome/browser/resources/extensions/chromeos/kiosk_apps.js +++ b/chrome/browser/resources/extensions/chromeos/kiosk_apps.js @@ -100,7 +100,7 @@ cr.define('extensions', function() { /** * Sets apps to be displayed in kiosk-app-list. - * @param {!Object.<{apps: !Array.<AppDict>, disableBailout: boolean, + * @param {!Object<{apps: !Array<AppDict>, disableBailout: boolean, * hasAutoLaunchApp: boolean}>} settings An object containing an array of * app info objects and disable bailout shortcut flag. */ diff --git a/chrome/browser/resources/extensions/extension_commands_overlay.js b/chrome/browser/resources/extensions/extension_commands_overlay.js index 7d2546d..a96ef44 100644 --- a/chrome/browser/resources/extensions/extension_commands_overlay.js +++ b/chrome/browser/resources/extensions/extension_commands_overlay.js @@ -51,7 +51,7 @@ cr.define('extensions', function() { /** * Called by the dom_ui_ to re-populate the page with data representing * the current state of extension commands. - * @param {!{commands: Array.<{name: string, id: string, commands: ?Array}>}} + * @param {!{commands: Array<{name: string, id: string, commands: ?Array}>}} * extensionsData */ ExtensionCommandsOverlay.returnExtensionsData = function(extensionsData) { diff --git a/chrome/browser/resources/extensions/extension_error.js b/chrome/browser/resources/extensions/extension_error.js index 20ae691..2452b12 100644 --- a/chrome/browser/resources/extensions/extension_error.js +++ b/chrome/browser/resources/extensions/extension_error.js @@ -85,7 +85,7 @@ cr.define('extensions', function() { /** * A variable length list of runtime or manifest errors for a given extension. - * @param {Array.<Object>} errors The list of extension errors with which + * @param {Array<Object>} errors The list of extension errors with which * to populate the list. * @constructor * @extends {HTMLDivElement} diff --git a/chrome/browser/resources/extensions/extension_error_overlay.js b/chrome/browser/resources/extensions/extension_error_overlay.js index 5d5978c..2b31335 100644 --- a/chrome/browser/resources/extensions/extension_error_overlay.js +++ b/chrome/browser/resources/extensions/extension_error_overlay.js @@ -26,7 +26,7 @@ var StackTrace; * renderProcessId: (number|undefined), * renderViewId: (number|undefined), * source: string, - * stackTrace: (Array.<StackTrace>|undefined), + * stackTrace: (Array<StackTrace>|undefined), * type: number}} */ var RuntimeError; diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js index de47102..d4fcbf6 100644 --- a/chrome/browser/resources/extensions/extension_list.js +++ b/chrome/browser/resources/extensions/extension_list.js @@ -38,7 +38,7 @@ * kioskOnly: boolean, * locationText: string, * managedInstall: boolean, - * manifestErrors: (Array.<RuntimeError>|undefined), + * manifestErrors: (Array<RuntimeError>|undefined), * name: string, * offlineEnabled: boolean, * optionsOpenInTab: boolean, @@ -50,13 +50,13 @@ * policyText: (string|undefined), * prettifiedPath: (string|undefined), * recommendedInstall: boolean, - * runtimeErrors: (Array.<RuntimeError>|undefined), + * runtimeErrors: (Array<RuntimeError>|undefined), * showAllUrls: boolean, * suspiciousInstall: boolean, * terminated: boolean, * updateRequiredByPolicy: boolean, * version: string, - * views: Array.<{renderViewId: number, renderProcessId: number, + * views: Array<{renderViewId: number, renderProcessId: number, * path: string, incognito: boolean, * generatedBackgroundPage: boolean}>, * wantsErrorCollection: boolean, @@ -77,7 +77,7 @@ cr.define('options', function() { var ExtensionsList = cr.ui.define('div'); /** - * @type {Object.<string, number>} A map from extension id to last reloaded + * @type {Object<string, number>} A map from extension id to last reloaded * timestamp. The timestamp is recorded when the user click the 'Reload' * link. It is used to refresh the icon of an unpacked extension. * This persists between calls to decorate. diff --git a/chrome/browser/resources/extensions/extension_loader.js b/chrome/browser/resources/extensions/extension_loader.js index a71baaf..e089c6f 100644 --- a/chrome/browser/resources/extensions/extension_loader.js +++ b/chrome/browser/resources/extensions/extension_loader.js @@ -80,7 +80,7 @@ cr.define('extensions', function() { /** * An array of Failures for keeping track of multiple active failures. - * @type {Array.<Failure>} + * @type {Array<Failure>} * @private */ this.failures_ = []; @@ -103,7 +103,7 @@ cr.define('extensions', function() { /** * Add a failure to failures_ array. If there is already a displayed * failure, display the additional failures element. - * @param {Array.<Object>} failures Array of failures containing paths, + * @param {Array<Object>} failures Array of failures containing paths, * errors, and manifests. * @private */ @@ -196,7 +196,7 @@ cr.define('extensions', function() { /** * Notify the ExtensionLoader that loading an unpacked extension failed. * Add the failure to failures_ and show the ExtensionLoadError. - * @param {Array.<Object>} failures Array of failures containing paths, + * @param {Array<Object>} failures Array of failures containing paths, * errors, and manifests. */ notifyFailed: function(failures) { @@ -206,7 +206,7 @@ cr.define('extensions', function() { /** * A static forwarding function for ExtensionLoader.notifyFailed. - * @param {Array.<Object>} failures Array of failures containing paths, + * @param {Array<Object>} failures Array of failures containing paths, * errors, and manifests. * @see ExtensionLoader.notifyFailed */ diff --git a/chrome/browser/resources/gaia_auth/background.js b/chrome/browser/resources/gaia_auth/background.js index cc80629..3b529f3 100644 --- a/chrome/browser/resources/gaia_auth/background.js +++ b/chrome/browser/resources/gaia_auth/background.js @@ -416,7 +416,7 @@ BackgroundBridge.prototype = { /** * Handler for 'getScrapedPasswords' request sent from the main script. - * @return {Array.<string>} The array with de-duped scraped passwords. + * @return {Array<string>} The array with de-duped scraped passwords. */ onGetScrapedPasswords_: function() { var passwords = {}; diff --git a/chrome/browser/resources/gaia_auth/main.js b/chrome/browser/resources/gaia_auth/main.js index dc1ebe4..a62e1bb 100644 --- a/chrome/browser/resources/gaia_auth/main.js +++ b/chrome/browser/resources/gaia_auth/main.js @@ -37,7 +37,7 @@ Authenticator.API_KEY_TYPES = [ /** * Allowed origins of the hosting page. - * @type {Array.<string>} + * @type {Array<string>} */ Authenticator.ALLOWED_PARENT_ORIGINS = [ 'chrome://oobe', diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js index cc7c579..bb6f946 100644 --- a/chrome/browser/resources/gaia_auth_host/authenticator.js +++ b/chrome/browser/resources/gaia_auth_host/authenticator.js @@ -52,7 +52,7 @@ cr.define('cr.login', function() { /** * Supported Authenticator params. - * @type {!Array.<string>} + * @type {!Array<string>} * @const */ var SUPPORTED_PARAMS = [ diff --git a/chrome/browser/resources/gaia_auth_host/gaia_auth_host.js b/chrome/browser/resources/gaia_auth_host/gaia_auth_host.js index aedb60b..7cef0cf 100644 --- a/chrome/browser/resources/gaia_auth_host/gaia_auth_host.js +++ b/chrome/browser/resources/gaia_auth_host/gaia_auth_host.js @@ -43,7 +43,7 @@ cr.define('cr.login', function() { /** * Supported params of auth extension. For a complete list, check out the * auth extension's main.js. - * @type {!Array.<string>} + * @type {!Array<string>} * @const */ var SUPPORTED_PARAMS = [ @@ -60,7 +60,7 @@ cr.define('cr.login', function() { /** * Supported localized strings. For a complete list, check out the auth * extension's offline.js - * @type {!Array.<string>} + * @type {!Array<string>} * @const */ var LOCALIZED_STRING_PARAMS = [ diff --git a/chrome/browser/resources/google_now/background.js b/chrome/browser/resources/google_now/background.js index 5d3eaf0..087b2ac 100644 --- a/chrome/browser/resources/google_now/background.js +++ b/chrome/browser/resources/google_now/background.js @@ -125,8 +125,8 @@ var ReceivedGroup; * * @typedef {{ * googleNowDisabled: (boolean|undefined), - * groups: Object.<string, ReceivedGroup>, - * notifications: Array.<ReceivedNotification> + * groups: Object<string, ReceivedGroup>, + * notifications: Array<ReceivedNotification> * }} */ var ServerResponse; @@ -139,7 +139,7 @@ var ServerResponse; * cards update and all the times after that. * * @typedef {{ - * cards: Array.<ReceivedNotification>, + * cards: Array<ReceivedNotification>, * cardsTimestamp: (number|undefined), * nextPollTime: (number|undefined), * rank: (number|undefined) @@ -342,14 +342,14 @@ function requestFromServer(method, handlerName, opt_contentType) { /** * Shows the notification groups as notification cards. - * @param {Object.<string, StoredNotificationGroup>} notificationGroups Map from + * @param {Object<string, StoredNotificationGroup>} notificationGroups Map from * group name to group information. * @param {function(ReceivedNotification)=} opt_onCardShown Optional parameter * called when each card is shown. * @return {Promise} A promise to show the notification groups as cards. */ function showNotificationGroups(notificationGroups, opt_onCardShown) { - /** @type {Object.<ChromeNotificationId, CombinedCard>} */ + /** @type {Object<ChromeNotificationId, CombinedCard>} */ var cards = combineCardsFromGroups(notificationGroups); console.log('showNotificationGroups ' + JSON.stringify(cards)); @@ -365,7 +365,7 @@ function showNotificationGroups(notificationGroups, opt_onCardShown) { cards[chromeNotificationId] = cards[chromeNotificationId] || []; } - /** @type {Object.<ChromeNotificationId, NotificationDataEntry>} */ + /** @type {Object<ChromeNotificationId, NotificationDataEntry>} */ var notificationsData = {}; // Create/update/delete notifications. @@ -402,7 +402,7 @@ function removeAllCards() { /** * Adds a card group into a set of combined cards. - * @param {Object.<ChromeNotificationId, CombinedCard>} combinedCards Map from + * @param {Object<ChromeNotificationId, CombinedCard>} combinedCards Map from * chromeNotificationId to a combined card. * This is an input/output parameter. * @param {StoredNotificationGroup} storedGroup Group to combine into the @@ -432,7 +432,7 @@ function combineGroup(combinedCards, storedGroup) { /** * Calculates the soonest poll time from a map of groups as an absolute time. - * @param {Object.<string, StoredNotificationGroup>} groups Map from group name + * @param {Object<string, StoredNotificationGroup>} groups Map from group name * to group information. * @return {number} The next poll time based off of the groups. */ @@ -454,7 +454,7 @@ function calculateNextPollTimeMilliseconds(groups) { /** * Schedules next cards poll. - * @param {Object.<string, StoredNotificationGroup>} groups Map from group name + * @param {Object<string, StoredNotificationGroup>} groups Map from group name * to group information. */ function scheduleNextCardsPoll(groups) { @@ -481,13 +481,13 @@ function scheduleOptInCheckPoll() { /** * Combines notification groups into a set of Chrome notifications. - * @param {Object.<string, StoredNotificationGroup>} notificationGroups Map from + * @param {Object<string, StoredNotificationGroup>} notificationGroups Map from * group name to group information. - * @return {Object.<ChromeNotificationId, CombinedCard>} Cards to show. + * @return {Object<ChromeNotificationId, CombinedCard>} Cards to show. */ function combineCardsFromGroups(notificationGroups) { console.log('combineCardsFromGroups ' + JSON.stringify(notificationGroups)); - /** @type {Object.<ChromeNotificationId, CombinedCard>} */ + /** @type {Object<ChromeNotificationId, CombinedCard>} */ var combinedCards = {}; for (var groupName in notificationGroups) @@ -514,16 +514,16 @@ function processServerResponse(response) { var receivedGroups = response.groups; return fillFromChromeLocalStorage({ - /** @type {Object.<string, StoredNotificationGroup>} */ + /** @type {Object<string, StoredNotificationGroup>} */ notificationGroups: {}, - /** @type {Object.<ServerNotificationId, number>} */ + /** @type {Object<ServerNotificationId, number>} */ recentDismissals: {} }).then(function(items) { console.log('processServerResponse-get ' + JSON.stringify(items)); // Build a set of non-expired recent dismissals. It will be used for // client-side filtering of cards. - /** @type {Object.<ServerNotificationId, number>} */ + /** @type {Object<ServerNotificationId, number>} */ var updatedRecentDismissals = {}; var now = Date.now(); for (var serverNotificationId in items.recentDismissals) { @@ -612,7 +612,7 @@ function shouldShowExplanatoryCard() { /** * Requests notification cards from the server for specified groups. - * @param {Array.<string>} groupNames Names of groups that need to be refreshed. + * @param {Array<string>} groupNames Names of groups that need to be refreshed. * @return {Promise} A promise to request the specified notification groups. */ function requestNotificationGroupsFromServer(groupNames) { @@ -694,7 +694,7 @@ function requestAndUpdateOptedIn() { */ function getGroupsToRequest() { return fillFromChromeLocalStorage({ - /** @type {Object.<string, StoredNotificationGroup>} */ + /** @type {Object<string, StoredNotificationGroup>} */ notificationGroups: {} }).then(function(items) { console.log('getGroupsToRequest-storage-get ' + JSON.stringify(items)); @@ -739,7 +739,7 @@ function requestNotificationCards() { * Determines if an immediate retry should occur based off of the given groups. * The NOR group is expected most often and less latency sensitive, so we will * simply wait MAXIMUM_POLLING_PERIOD_SECONDS before trying again. - * @param {Array.<string>} groupNames Names of groups that need to be refreshed. + * @param {Array<string>} groupNames Names of groups that need to be refreshed. * @return {boolean} Whether a retry should occur. */ function shouldScheduleRetryFromGroupList(groupNames) { @@ -833,9 +833,9 @@ function requestCardDismissal( */ function processPendingDismissals() { return fillFromChromeLocalStorage({ - /** @type {Array.<PendingDismissal>} */ + /** @type {Array<PendingDismissal>} */ pendingDismissals: [], - /** @type {Object.<ServerNotificationId, number>} */ + /** @type {Object<ServerNotificationId, number>} */ recentDismissals: {} }).then(function(items) { console.log( @@ -913,7 +913,7 @@ function openUrl(url) { */ function onNotificationClicked(chromeNotificationId, selector) { fillFromChromeLocalStorage({ - /** @type {Object.<ChromeNotificationId, NotificationDataEntry>} */ + /** @type {Object<ChromeNotificationId, NotificationDataEntry>} */ notificationsData: {} }).then(function(items) { /** @type {(NotificationDataEntry|undefined)} */ @@ -946,11 +946,11 @@ function onNotificationClosed(chromeNotificationId, byUser) { dismissalAttempts.start(); fillFromChromeLocalStorage({ - /** @type {Array.<PendingDismissal>} */ + /** @type {Array<PendingDismissal>} */ pendingDismissals: [], - /** @type {Object.<ChromeNotificationId, NotificationDataEntry>} */ + /** @type {Object<ChromeNotificationId, NotificationDataEntry>} */ notificationsData: {}, - /** @type {Object.<string, StoredNotificationGroup>} */ + /** @type {Object<string, StoredNotificationGroup>} */ notificationGroups: {} }).then(function(items) { /** @type {NotificationDataEntry} */ @@ -1258,7 +1258,7 @@ instrumented.runtime.onStartup.addListener(function() { // persistent notifications will work. tasks.add(SHOW_ON_START_TASK_NAME, function() { fillFromChromeLocalStorage({ - /** @type {Object.<string, StoredNotificationGroup>} */ + /** @type {Object<string, StoredNotificationGroup>} */ notificationGroups: {} }).then(function(items) { console.log('onStartup-get ' + JSON.stringify(items)); @@ -1346,7 +1346,7 @@ instrumented.pushMessaging.onMessage.addListener(function(message) { // preventing polling the server when the payload really didn't change. fillFromChromeLocalStorage({ lastPollNowPayloads: {}, - /** @type {Object.<string, StoredNotificationGroup>} */ + /** @type {Object<string, StoredNotificationGroup>} */ notificationGroups: {} }, PromiseRejection.ALLOW).then(function(items) { if (items.lastPollNowPayloads[message.subchannelId] != diff --git a/chrome/browser/resources/google_now/cards.js b/chrome/browser/resources/google_now/cards.js index dd4e950..0ecd501 100644 --- a/chrome/browser/resources/google_now/cards.js +++ b/chrome/browser/resources/google_now/cards.js @@ -37,7 +37,7 @@ var DismissalData; * * @typedef {{ * messageUrl: (string|undefined), - * buttonUrls: (Array.<string>|undefined) + * buttonUrls: (Array<string>|undefined) * }} */ var ActionUrls; @@ -82,7 +82,7 @@ var UncombinedNotification; /** * Card combined from potentially multiple groups. * - * @typedef {Array.<UncombinedNotification>} + * @typedef {Array<UncombinedNotification>} */ var CombinedCard; @@ -192,7 +192,7 @@ function buildCardSet() { * of the card. * @param {CombinedCard} combinedCard Combined cards with * |chromeNotificationId|. - * @param {Object.<string, StoredNotificationGroup>} notificationGroups + * @param {Object<string, StoredNotificationGroup>} notificationGroups * Map from group name to group information. * @param {function(ReceivedNotification)=} onCardShown Optional parameter * called when each card is shown. @@ -283,18 +283,18 @@ function buildCardSet() { * of the card. * @param {NotificationDataEntry} notificationData Stored notification entry * for this card. - * @param {Object.<string, StoredNotificationGroup>} notificationGroups + * @param {Object<string, StoredNotificationGroup>} notificationGroups * Map from group name to group information. * @return {{ - * dismissals: Array.<DismissalData>, + * dismissals: Array<DismissalData>, * notificationData: (NotificationDataEntry|undefined) * }} */ function onDismissal( chromeNotificationId, notificationData, notificationGroups) { - /** @type {Array.<DismissalData>} */ + /** @type {Array<DismissalData>} */ var dismissals = []; - /** @type {Array.<UncombinedNotification>} */ + /** @type {Array<UncombinedNotification>} */ var newCombinedCard = []; // Determine which parts of the combined card need to be dismissed or to be @@ -325,7 +325,7 @@ function buildCardSet() { * Removes card information from |notificationGroups|. * @param {ChromeNotificationId} chromeNotificationId chrome.notifications ID * of the card. - * @param {Object.<string, StoredNotificationGroup>} notificationGroups + * @param {Object<string, StoredNotificationGroup>} notificationGroups * Map from group name to group information. */ function clearCardFromGroups(chromeNotificationId, notificationGroups) { @@ -350,9 +350,9 @@ function buildCardSet() { /** @type {ChromeNotificationId} */ var chromeNotificationId = alarm.name.substring(alarmPrefix.length); fillFromChromeLocalStorage({ - /** @type {Object.<ChromeNotificationId, NotificationDataEntry>} */ + /** @type {Object<ChromeNotificationId, NotificationDataEntry>} */ notificationsData: {}, - /** @type {Object.<string, StoredNotificationGroup>} */ + /** @type {Object<string, StoredNotificationGroup>} */ notificationGroups: {} }).then(function(items) { console.log('cardManager.onAlarm.get ' + JSON.stringify(items)); diff --git a/chrome/browser/resources/google_now/common_test_util.js b/chrome/browser/resources/google_now/common_test_util.js index c090c95..fe57082 100644 --- a/chrome/browser/resources/google_now/common_test_util.js +++ b/chrome/browser/resources/google_now/common_test_util.js @@ -60,7 +60,7 @@ function mockChromeEvent(topLevelContainer, eventIdentifier) { * Gets the array of event handlers added by a mocked 'addListener' function. * @param {string} eventIdentifier Event identifier, such as * 'runtime.onSuspend'. - * @return {Array.<Function>} Array of handlers. + * @return {Array<Function>} Array of handlers. */ function getMockHandlerContainer(eventIdentifier) { var eventIdentifierParts = eventIdentifier.split('.'); diff --git a/chrome/browser/resources/google_now/utility.js b/chrome/browser/resources/google_now/utility.js index a02e07d..dfcb8d8 100644 --- a/chrome/browser/resources/google_now/utility.js +++ b/chrome/browser/resources/google_now/utility.js @@ -266,7 +266,7 @@ var wrapper = (function() { * callbacks. This is a map from unique callback id to the stack at the moment * when the callback was wrapped. This stack identifies the callback. * Used only for diagnostics. - * @type {Object.<number, string>} + * @type {Object<number, string>} */ var pendingCallbacks = {}; @@ -345,7 +345,7 @@ var wrapper = (function() { /** * Returns an instrumented function. - * @param {!Array.<string>} functionIdentifierParts Path to the chrome.* + * @param {!Array<string>} functionIdentifierParts Path to the chrome.* * function. * @param {string} functionName Name of the chrome API function. * @param {number} callbackParameter Index of the callback parameter to this @@ -515,7 +515,7 @@ function registerPromiseAdapter() { * The indirection allows quick checks against the array and clearing the * array without ugly splicing and copying. * @typedef {{ - * callback: array.<Function>= + * callback: array<Function>= * }} */ var CallbackTracker; @@ -696,7 +696,7 @@ function buildTaskManager(areConflicting) { /** * Queue of scheduled tasks. The first element, if present, corresponds to the * currently running task. - * @type {Array.<Object.<string, function()>>} + * @type {Array<Object<string, function()>>} */ var queue = []; diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js index 24a6736..96f0e48 100644 --- a/chrome/browser/resources/history/history.js +++ b/chrome/browser/resources/history/history.js @@ -50,7 +50,7 @@ var SupervisedUserFilteringBehavior = { * The type of the history result object. The definition is based on * chrome/browser/ui/webui/history_ui.cc: * BrowsingHistoryHandler::HistoryEntry::ToValue() - * @typedef {{allTimestamps: Array.<number>, + * @typedef {{allTimestamps: Array<number>, * blockedVisit: (boolean|undefined), * dateRelativeDay: (string|undefined), * dateShort: string, @@ -631,7 +631,7 @@ HistoryModel.prototype.requestPage = function(page) { /** * Receiver for history query. * @param {HistoryQuery} info An object containing information about the query. - * @param {Array.<HistoryEntry>} results A list of results. + * @param {Array<HistoryEntry>} results A list of results. */ HistoryModel.prototype.addResults = function(info, results) { // If no requests are in flight then this was an old request so we drop the @@ -675,7 +675,7 @@ HistoryModel.prototype.getSize = function() { * Get a list of visits between specified index positions. * @param {number} start The start index. * @param {number} end The end index. - * @return {Array.<Visit>} A list of visits. + * @return {Array<Visit>} A list of visits. */ HistoryModel.prototype.getNumberedRange = function(start, end) { return this.visits_.slice(start, end); @@ -693,7 +693,7 @@ HistoryModel.prototype.hasMoreResults = function() { /** * Removes a list of visits from the history, and calls |callback| when the * removal has successfully completed. - * @param {Array.<Visit>} visits The visits to remove. + * @param {Array<Visit>} visits The visits to remove. * @param {Function} callback The function to call after removal succeeds. */ HistoryModel.prototype.removeVisitsFromHistory = function(visits, callback) { @@ -1022,7 +1022,7 @@ function HistoryView(model) { $('timeframe-controls').onchange = function(e) { var value = parseInt(e.target.value, 10); - self.setRangeInDays(/** @type {HistoryModel.Range.<number>} */(value)); + self.setRangeInDays(/** @type {HistoryModel.Range<number>} */(value)); }; $('range-previous').addEventListener('click', function(e) { @@ -2003,7 +2003,7 @@ function load() { $('history-page').appendChild($('clear-browsing-data')); } else { window.addEventListener('message', function(e) { - e = /** @type {!MessageEvent.<!{method: string}>} */(e); + e = /** @type {!MessageEvent<!{method: string}>} */(e); if (e.data.method == 'frameSelected') searchField.focus(); }); @@ -2364,7 +2364,7 @@ function getFilteringStatusDOM(filteringBehavior) { /** * Our history system calls this function with results from searches. * @param {HistoryQuery} info An object containing information about the query. - * @param {Array.<HistoryEntry>} results A list of results. + * @param {Array<HistoryEntry>} results A list of results. */ function historyResult(info, results) { historyModel.addResults(info, results); diff --git a/chrome/browser/resources/hotword/audio_client.js b/chrome/browser/resources/hotword/audio_client.js index df64522..f74f84b 100644 --- a/chrome/browser/resources/hotword/audio_client.js +++ b/chrome/browser/resources/hotword/audio_client.js @@ -30,7 +30,7 @@ /** * Keeps track of the effects of different commands. Used to verify that * proper UIs are shown to the user. - * @private {Object.<AudioClient.CommandToPage, Object>} + * @private {Object<AudioClient.CommandToPage, Object>} */ this.uiStatus_ = null; diff --git a/chrome/browser/resources/hotword/nacl_manager.js b/chrome/browser/resources/hotword/nacl_manager.js index 7d67576..4b5b557 100644 --- a/chrome/browser/resources/hotword/nacl_manager.js +++ b/chrome/browser/resources/hotword/nacl_manager.js @@ -238,7 +238,7 @@ NaClManager.prototype.fileExists_ = function(path) { /** * Creates and returns a list of possible languages to check for hotword * support. - * @return {!Array.<string>} Array of languages. + * @return {!Array<string>} Array of languages. * @private */ NaClManager.prototype.getPossibleLanguages_ = function() { diff --git a/chrome/browser/resources/hotword/page_audio_manager.js b/chrome/browser/resources/hotword/page_audio_manager.js index 5eac1f0..2118e20 100644 --- a/chrome/browser/resources/hotword/page_audio_manager.js +++ b/chrome/browser/resources/hotword/page_audio_manager.js @@ -23,7 +23,7 @@ cr.define('hotword', function() { /** * Mapping between tab ID and port that is connected from the injected * content script. - * @private {!Object.<number, Port>} + * @private {!Object<number, Port>} */ this.portMap_ = {}; diff --git a/chrome/browser/resources/hotword/state_manager.js b/chrome/browser/resources/hotword/state_manager.js index 31258a5..1b94e70 100644 --- a/chrome/browser/resources/hotword/state_manager.js +++ b/chrome/browser/resources/hotword/state_manager.js @@ -72,7 +72,7 @@ cr.define('hotword', function() { /** * Currently active hotwording sessions. - * @private {!Array.<Session_>} + * @private {!Array<Session_>} */ this.sessions_ = []; diff --git a/chrome/browser/resources/hotword_helper/audio_client.js b/chrome/browser/resources/hotword_helper/audio_client.js index 927e0f7..3b0b46c 100644 --- a/chrome/browser/resources/hotword_helper/audio_client.js +++ b/chrome/browser/resources/hotword_helper/audio_client.js @@ -32,7 +32,7 @@ /** * Keeps track of the effects of different commands. Used to verify that * proper UIs are shown to the user. - * @private {Object.<AudioClient.CommandToPage, Object>} + * @private {Object<AudioClient.CommandToPage, Object>} */ this.uiStatus_ = null; diff --git a/chrome/browser/resources/identity_internals.js b/chrome/browser/resources/identity_internals.js index 7e7a01f..ae03623 100644 --- a/chrome/browser/resources/identity_internals.js +++ b/chrome/browser/resources/identity_internals.js @@ -197,7 +197,7 @@ cr.define('identity_internals', function() { /** * Callback function that removes a token from UI once it has been revoked. - * @param {!Array.<string>} accessTokens Array with a single element, which is + * @param {!Array<string>} accessTokens Array with a single element, which is * an access token to be removed. */ function tokenRevokeDone(accessTokens) { diff --git a/chrome/browser/resources/local_discovery/local_discovery.js b/chrome/browser/resources/local_discovery/local_discovery.js index a372f8e..9d437aa 100644 --- a/chrome/browser/resources/local_discovery/local_discovery.js +++ b/chrome/browser/resources/local_discovery/local_discovery.js @@ -35,7 +35,7 @@ cr.define('local_discovery', function() { /** * Map of service names to corresponding service objects. - * @type {Object.<string,Service>} + * @type {Object<string,Service>} */ var devices = {}; @@ -341,7 +341,7 @@ cr.define('local_discovery', function() { /** * Create the DOM for a cloud device described by the device section. - * @param {Array.<Object>} devices_list List of devices. + * @param {Array<Object>} devices_list List of devices. */ function createCloudDeviceDOM(device) { var devicesDomElement = document.createElement('div'); @@ -366,7 +366,7 @@ cr.define('local_discovery', function() { /** * Handle a list of cloud devices available to the user globally. - * @param {Array.<Object>} devices_list List of devices. + * @param {Array<Object>} devices_list List of devices. */ function onCloudDeviceListAvailable(devices_list) { var devicesListLength = devices_list.length; diff --git a/chrome/browser/resources/local_ntp/instant_iframe_validation.js b/chrome/browser/resources/local_ntp/instant_iframe_validation.js index 3e4c128..822350d 100644 --- a/chrome/browser/resources/local_ntp/instant_iframe_validation.js +++ b/chrome/browser/resources/local_ntp/instant_iframe_validation.js @@ -38,7 +38,7 @@ function isValidRBGAComponent(component) { /** * Converts an Array of color components into RGBA format "rgba(R,G,B,A)". - * @param {Array.<number>} rgbaColor Array of rgba color components. + * @param {Array<number>} rgbaColor Array of rgba color components. * @return {?string} CSS color in RGBA format or null if invalid. */ function convertArrayToRGBAColor(rgbaColor) { diff --git a/chrome/browser/resources/local_ntp/local_ntp.js b/chrome/browser/resources/local_ntp/local_ntp.js index d04aad5..c398058 100644 --- a/chrome/browser/resources/local_ntp/local_ntp.js +++ b/chrome/browser/resources/local_ntp/local_ntp.js @@ -148,7 +148,7 @@ var ntpContents; /** * The array of rendered tiles, ordered by appearance. - * @type {!Array.<Tile>} + * @type {!Array<Tile>} */ var tiles = []; @@ -462,7 +462,7 @@ function setAttributionVisibility_(show) { /** * Converts an Array of color components into RRGGBBAA format. - * @param {Array.<number>} color Array of rgba color components. + * @param {Array<number>} color Array of rgba color components. * @return {string} Color string in RRGGBBAA format. * @private */ @@ -475,7 +475,7 @@ function convertToRRGGBBAAColor(color) { /** * Converts an Array of color components into RGBA format "rgba(R,G,B,A)". - * @param {Array.<number>} color Array of rgba color components. + * @param {Array<number>} color Array of rgba color components. * @return {string} CSS color in RGBA format. * @private */ diff --git a/chrome/browser/resources/local_ntp/most_visited_util.js b/chrome/browser/resources/local_ntp/most_visited_util.js index d5ad94b..f2f7136 100644 --- a/chrome/browser/resources/local_ntp/most_visited_util.js +++ b/chrome/browser/resources/local_ntp/most_visited_util.js @@ -185,7 +185,7 @@ function createMostVisitedLink(params, href, title, text, direction, provider) { /** * Returns the color to display string with, depending on whether title is * displayed, the current theme, and URL parameters. - * @param {Object.<string, string>} params URL parameters specifying style. + * @param {Object<string, string>} params URL parameters specifying style. * @param {boolean} isTitle if the style is for the Most Visited Title. * @return {string} The color to use, in "rgba(#,#,#,#)" format. */ @@ -221,7 +221,7 @@ function getTextColor(params, isTitle) { * - fs: font-size as a number in pixels. * - ta: text-align property, as a string. * - tf: specifying a text fade starting position, in pixels. - * @param {Object.<string, string>} params URL parameters specifying style. + * @param {Object<string, string>} params URL parameters specifying style. * @param {boolean} isTitle if the style is for the Most Visited Title. * @return {Object} Styles suitable for CSS interpolation. */ diff --git a/chrome/browser/resources/net_internals/dns_view.js b/chrome/browser/resources/net_internals/dns_view.js index 806668f..ce507ef 100644 --- a/chrome/browser/resources/net_internals/dns_view.js +++ b/chrome/browser/resources/net_internals/dns_view.js @@ -202,7 +202,7 @@ var DnsView = (function() { * Takes a last of strings and adds them all to a DOM node, displaying them * on separate lines. * @param {DomNode} node The parent node. - * @param {Array.<string>} list List of strings to add to the node. + * @param {Array<string>} list List of strings to add to the node. */ function addListToNode_(node, list) { for (var i = 0; i < list.length; ++i) diff --git a/chrome/browser/resources/network_speech_synthesis/tts_extension.js b/chrome/browser/resources/network_speech_synthesis/tts_extension.js index ebe9227..905fbfe 100644 --- a/chrome/browser/resources/network_speech_synthesis/tts_extension.js +++ b/chrome/browser/resources/network_speech_synthesis/tts_extension.js @@ -38,7 +38,7 @@ TtsExtension.prototype = { * A mapping from language and gender to voice name, hardcoded for now * until the speech synthesis server capabilities response provides this. * The key of this map is of the form '<lang>-<gender>'. - * @type {Object.<string, string>} + * @type {Object<string, string>} * @private */ LANG_AND_GENDER_TO_VOICE_NAME_: { @@ -68,7 +68,7 @@ TtsExtension.prototype = { * A mapping from voice name to language and gender, derived from the * manifest file. This is used in case the speech synthesis request * specifies a voice name but doesn't specify a language code or gender. - * @type {Object.<string, {lang: string, gender: string}>} + * @type {Object<string, {lang: string, gender: string}>} * @private */ voiceNameToLangAndGender_: {}, diff --git a/chrome/browser/resources/ntp4/most_visited_page.js b/chrome/browser/resources/ntp4/most_visited_page.js index 0edb54a..4f6cbd1 100644 --- a/chrome/browser/resources/ntp4/most_visited_page.js +++ b/chrome/browser/resources/ntp4/most_visited_page.js @@ -370,7 +370,7 @@ cr.define('ntp', function() { /** * Array of most visited data objects. - * @type {Array.<PageData>} + * @type {Array<PageData>} */ get data() { return this.data_; diff --git a/chrome/browser/resources/ntp4/new_tab.js b/chrome/browser/resources/ntp4/new_tab.js index 05aeabf..f5eab1c 100644 --- a/chrome/browser/resources/ntp4/new_tab.js +++ b/chrome/browser/resources/ntp4/new_tab.js @@ -438,7 +438,7 @@ cr.define('ntp', function() { * Shows the notification bubble. * @param {string|Node} message The notification message or node to use as * message. - * @param {Array.<{text: string, action: function()}>} links An array of + * @param {Array<{text: string, action: function()}>} links An array of * records describing the links in the notification. Each record should * have a 'text' attribute (the display string) and an 'action' attribute * (a function to run when the link is activated). @@ -553,7 +553,7 @@ cr.define('ntp', function() { } /** - * @param {Array.<PageData>} data + * @param {Array<PageData>} data * @param {boolean} hasBlacklistedUrls */ function setMostVisitedPages(data, hasBlacklistedUrls) { diff --git a/chrome/browser/resources/ntp4/other_sessions.js b/chrome/browser/resources/ntp4/other_sessions.js index 38fec9d..780ad79 100644 --- a/chrome/browser/resources/ntp4/other_sessions.js +++ b/chrome/browser/resources/ntp4/other_sessions.js @@ -12,7 +12,7 @@ * modifiedTime: string, * name: string, * tag: string, - * windows: Array.<WindowData>}} + * windows: Array<WindowData>}} * @see chrome/browser/ui/webui/ntp/foreign_session_handler.cc */ var SessionData; @@ -257,7 +257,7 @@ cr.define('ntp', function() { * foreign sessions, or tab sync is disabled for this profile. * |isTabSyncEnabled| makes it possible to distinguish between the cases. * - * @param {Array.<SessionData>} sessionList Array of objects describing the + * @param {Array<SessionData>} sessionList Array of objects describing the * sessions from other devices. * @param {boolean} isTabSyncEnabled Is tab sync enabled for this profile? */ diff --git a/chrome/browser/resources/ntp4/page_list_view.js b/chrome/browser/resources/ntp4/page_list_view.js index 0fac274..14c613b 100644 --- a/chrome/browser/resources/ntp4/page_list_view.js +++ b/chrome/browser/resources/ntp4/page_list_view.js @@ -350,7 +350,7 @@ cr.define('ntp', function() { * Note that calls to this function can occur at any time, not just in * response to a getApps request. For example, when a user * installs/uninstalls an app on another synchronized devices. - * @param {{apps: Array.<AppInfo>, appPageNames: Array.<string>}} data + * @param {{apps: Array<AppInfo>, appPageNames: Array<string>}} data * An object with all the data on available applications. */ getAppsCallback: function(data) { diff --git a/chrome/browser/resources/omnibox/omnibox.js b/chrome/browser/resources/omnibox/omnibox.js index 96ad0ca..d275849 100644 --- a/chrome/browser/resources/omnibox/omnibox.js +++ b/chrome/browser/resources/omnibox/omnibox.js @@ -116,7 +116,7 @@ define('main', [ * properties to output in what order. This is an array of * PresentationInfoRecord() objects; for details see that * function. - * @type {Array.<Object>} + * @type {Array<Object>} * @const */ var PROPERTY_OUTPUT_ORDER = [ diff --git a/chrome/browser/resources/options/autofill_edit_address_overlay.js b/chrome/browser/resources/options/autofill_edit_address_overlay.js index b5fe9be..5dbe25e 100644 --- a/chrome/browser/resources/options/autofill_edit_address_overlay.js +++ b/chrome/browser/resources/options/autofill_edit_address_overlay.js @@ -360,7 +360,7 @@ cr.define('options', function() { * Takes a snapshot of the input values, clears the input values, loads the * address input layout from |input.components|, restores the input values * from snapshot, and stores the |input.languageCode| for the address. - * @param {{languageCode: string, components: Array.<Array.<Object>>}} input + * @param {{languageCode: string, components: Array<Array<Object>>}} input * Info about how to layout inputs fields in this dialog. * @private */ @@ -380,7 +380,7 @@ cr.define('options', function() { /** * Clears address inputs and rebuilds the input fields according to * |components|. - * @param {Array.<Array.<Object>>} components A list of information about + * @param {Array<Array<Object>>} components A list of information about * each input field. * @private */ diff --git a/chrome/browser/resources/options/autofill_options_list.js b/chrome/browser/resources/options/autofill_options_list.js index e62ff09..2289730 100644 --- a/chrome/browser/resources/options/autofill_options_list.js +++ b/chrome/browser/resources/options/autofill_options_list.js @@ -235,7 +235,7 @@ cr.define('options.autofillOptions', function() { * Creates a new name value list item. * @param {options.autofillOptions.AutofillNameValuesList} list The parent * list of this item. - * @param {Array.<string>} entry An array of [first, middle, last] names. + * @param {Array<string>} entry An array of [first, middle, last] names. * @constructor * @extends {options.autofillOptions.ValuesListItem} */ @@ -469,7 +469,7 @@ cr.define('options.autofillOptions', function() { /** * @override - * @param {Array.<string>} entry + * @param {Array<string>} entry */ createItem: function(entry) { return new NameListItem(this, entry); @@ -508,7 +508,7 @@ cr.define('options.autofillOptions', function() { /** * Pending Promise resolver functions. - * @type {Array.<!Function>} + * @type {Array<!Function>} * @private */ validationPromiseResolvers_: [], diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js index 0eb90aa..c995709 100644 --- a/chrome/browser/resources/options/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js @@ -1474,7 +1474,7 @@ cr.define('options', function() { /** * Adds all |profiles| to the list. - * @param {Array.<!options.Profile>} profiles An array of profile info + * @param {Array<!options.Profile>} profiles An array of profile info * objects. * @private */ diff --git a/chrome/browser/resources/options/certificate_tree.js b/chrome/browser/resources/options/certificate_tree.js index e7752c8..6be4eeb 100644 --- a/chrome/browser/resources/options/certificate_tree.js +++ b/chrome/browser/resources/options/certificate_tree.js @@ -6,7 +6,7 @@ * @typedef {{ * id: string, * name: string, - * subnodes: Array.<{id: string, name: string, readonly: boolean, + * subnodes: Array<{id: string, name: string, readonly: boolean, * untrusted: boolean, extractable: boolean, * policy: boolean}> * }} @@ -143,7 +143,7 @@ cr.define('options', function() { /** * Populate the tree. - * @param {Array.<CertificateData>} nodesData Nodes data array. + * @param {Array<CertificateData>} nodesData Nodes data array. */ populate: function(nodesData) { this.clear(); diff --git a/chrome/browser/resources/options/chromeos/accounts_user_list.js b/chrome/browser/resources/options/chromeos/accounts_user_list.js index 018f63c..8bb3e3f 100644 --- a/chrome/browser/resources/options/chromeos/accounts_user_list.js +++ b/chrome/browser/resources/options/chromeos/accounts_user_list.js @@ -81,7 +81,7 @@ cr.define('options.accounts', function() { /** * Loads given user list. - * @param {!Array.<Object>} users An array of user info objects. + * @param {!Array<Object>} users An array of user info objects. * @private */ load_: function(users) { diff --git a/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js index 35c5b20..63b9ee4 100644 --- a/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js +++ b/chrome/browser/resources/options/chromeos/bluetooth_pair_device_overlay.js @@ -27,7 +27,7 @@ cr.define('options', function() { /** * List of IDs for conditionally visible elements in the dialog. - * @type {Array.<string>} + * @type {Array<string>} * @const */ var ELEMENTS = ['bluetooth-pairing-passkey-display', @@ -233,7 +233,7 @@ cr.define('options', function() { /** * Updates the visibility of elements in the dialog. - * @param {Array.<string>} list List of conditionally visible elements that + * @param {Array<string>} list List of conditionally visible elements that * are to be made visible. * @private */ diff --git a/chrome/browser/resources/options/chromeos/change_picture_options.js b/chrome/browser/resources/options/chromeos/change_picture_options.js index e2866f9..de6670a 100644 --- a/chrome/browser/resources/options/chromeos/change_picture_options.js +++ b/chrome/browser/resources/options/chromeos/change_picture_options.js @@ -10,7 +10,7 @@ cr.define('options', function() { /** * Array of button URLs used on this page. - * @type {Array.<string>} + * @type {Array<string>} * @const */ var ButtonImageUrls = [ @@ -303,7 +303,7 @@ cr.define('options', function() { /** * Appends default images to the image grid. Should only be called once. - * @param {Array.<{url: string, author: string, website: string}>} + * @param {Array<{url: string, author: string, website: string}>} * imagesData An array of default images data, including URL, author and * website. * @private diff --git a/chrome/browser/resources/options/chromeos/display_options.js b/chrome/browser/resources/options/chromeos/display_options.js index 2bd934e..64bebd1 100644 --- a/chrome/browser/resources/options/chromeos/display_options.js +++ b/chrome/browser/resources/options/chromeos/display_options.js @@ -6,13 +6,13 @@ cr.exportPath('options'); /** * @typedef {{ - * availableColorProfiles: Array.<{profileId: number, name: string}>, + * availableColorProfiles: Array<{profileId: number, name: string}>, * colorProfile: number, * height: number, * id: string, * isInternal: boolean, * isPrimary: boolean, - * resolutions: Array.<{width: number, height: number, originalWidth: number, + * resolutions: Array<{width: number, height: number, originalWidth: number, * originalHeight: number, deviceScaleFactor: number, scale: number, * refreshRate: number, isBest: boolean, selected: boolean}>, * name: string, @@ -125,7 +125,7 @@ cr.define('options', function() { /** * The array of current output displays. It also contains the display * rectangles currently rendered on screen. - * @type {Array.<options.DisplayInfo>} + * @type {Array<options.DisplayInfo>} * @private */ displays_: [], @@ -906,7 +906,7 @@ cr.define('options', function() { /** * Called when the display arrangement has changed. * @param {boolean} mirroring Whether current mode is mirroring or not. - * @param {Array.<options.DisplayInfo>} displays The list of the display + * @param {Array<options.DisplayInfo>} displays The list of the display * information. * @param {options.SecondaryDisplayLayout} layout The layout strategy. * @param {number} offset The offset of the secondary display. diff --git a/chrome/browser/resources/options/chromeos/keyboard_overlay.js b/chrome/browser/resources/options/chromeos/keyboard_overlay.js index ae4baa0..b18af10 100644 --- a/chrome/browser/resources/options/chromeos/keyboard_overlay.js +++ b/chrome/browser/resources/options/chromeos/keyboard_overlay.js @@ -8,7 +8,7 @@ cr.define('options', function() { * Auto-repeat delays (in ms) for the corresponding slider values, from * long to short. The values were chosen to provide a large range while giving * several options near the defaults. - * @type {!Array.<number>} + * @type {!Array<number>} * @const */ var AUTO_REPEAT_DELAYS = @@ -18,7 +18,7 @@ cr.define('options', function() { * Auto-repeat intervals (in ms) for the corresponding slider values, from * long to short. The slider itself is labeled "rate", the inverse of * interval, and goes from slow (long interval) to fast (short interval). - * @type {!Array.<number>} + * @type {!Array<number>} * @const */ var AUTO_REPEAT_INTERVALS = @@ -138,7 +138,7 @@ cr.define('options', function() { * |value|. * @param {string} id The slider's ID. * @param {number} value The value to find. - * @param {!Array.<number>} values The array to search. + * @param {!Array<number>} values The array to search. * @private */ updateSliderFromValue_: function(id, value, values) { diff --git a/chrome/browser/resources/options/chromeos/network_list.js b/chrome/browser/resources/options/chromeos/network_list.js index 4c65b34..af4bfbc 100644 --- a/chrome/browser/resources/options/chromeos/network_list.js +++ b/chrome/browser/resources/options/chromeos/network_list.js @@ -110,7 +110,7 @@ cr.define('options.network', function() { /** * Icon to use when not connected to a particular type of network. - * @type {!Object.<string, string>} Mapping of network type to icon data url. + * @type {!Object<string, string>} Mapping of network type to icon data url. * @private */ var defaultIcons_ = {}; @@ -172,7 +172,7 @@ cr.define('options.network', function() { /** * Description of the network group or control. - * @type {Object.<string,Object>} + * @type {Object<string,Object>} * @private */ data_: null, @@ -413,7 +413,7 @@ cr.define('options.network', function() { /** * Creates a control for selecting or configuring a network connection based * on the type of connection (e.g. wifi versus vpn). - * @param {{key: string, networkList: Array.<NetworkInfo>}} data Description + * @param {{key: string, networkList: Array<NetworkInfo>}} data Description * of the network. * @constructor * @extends {NetworkMenuItem} @@ -687,7 +687,7 @@ cr.define('options.network', function() { /** * Extracts a mapping of network names to menu element and position. * @param {!Element} menu The menu to process. - * @return {Object.<string, ?{index: number, button: Element}>} + * @return {Object<string, ?{index: number, button: Element}>} * Network mapping. * @private */ @@ -908,7 +908,7 @@ cr.define('options.network', function() { /** * Updates a network control. - * @param {Object.<string,string>} data Description of the entry. + * @param {Object<string,string>} data Description of the entry. */ update: function(data) { this.startBatchUpdates(); @@ -956,7 +956,7 @@ cr.define('options.network', function() { createItem: function(entry) { if (entry.networkList) return new NetworkSelectorItem( - /** @type {{key: string, networkList: Array.<NetworkInfo>}} */( + /** @type {{key: string, networkList: Array<NetworkInfo>}} */( entry)); if (entry.command) return new NetworkButtonItem( @@ -995,7 +995,7 @@ cr.define('options.network', function() { /** * Sets the default icon to use for each network type if disconnected. - * @param {!Object.<string, string>} data Mapping of network type to icon + * @param {!Object<string, string>} data Mapping of network type to icon * data url. */ NetworkList.setDefaultNetworkIcons = function(data) { @@ -1009,14 +1009,14 @@ cr.define('options.network', function() { * cellularSimAbsent: boolean, * cellularSimLockType: string, * cellularSupportsScan: boolean, - * rememberedList: Array.<NetworkInfo>, - * vpnList: Array.<NetworkInfo>, + * rememberedList: Array<NetworkInfo>, + * vpnList: Array<NetworkInfo>, * wifiAvailable: boolean, * wifiEnabled: boolean, * wimaxAvailable: boolean, * wimaxEnabled: boolean, - * wiredList: Array.<NetworkInfo>, - * wirelessList: Array.<NetworkInfo>}} data Description of available + * wiredList: Array<NetworkInfo>, + * wirelessList: Array<NetworkInfo>}} data Description of available * network devices and their corresponding state. */ NetworkList.refreshNetworkData = function(data) { @@ -1209,7 +1209,7 @@ cr.define('options.network', function() { /** * Fetches the active connection. - * @param {Array.<Object>} networkList List of networks. + * @param {Array<Object>} networkList List of networks. * @return {Object} * @private */ diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js index df2ba08..5e272f3 100644 --- a/chrome/browser/resources/options/content_settings.js +++ b/chrome/browser/resources/options/content_settings.js @@ -131,7 +131,7 @@ cr.define('options', function() { /** * Sets the values for all the content settings radios and labels. - * @param {Object.<string, {managedBy: string, value: string}>} dict A mapping + * @param {Object<string, {managedBy: string, value: string}>} dict A mapping * from radio groups to the checked value for that group. */ ContentSettings.setContentFilterSettingsValue = function(dict) { @@ -218,7 +218,7 @@ cr.define('options', function() { /** * Initializes an exceptions list. * @param {string} type The content type that we are setting exceptions for. - * @param {Array.<options.Exception>} exceptions An array of pairs, where the + * @param {Array<options.Exception>} exceptions An array of pairs, where the * first element of each pair is the filter string, and the second is the * setting (allow/block). */ diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js index cef2cd8..74bd582 100644 --- a/chrome/browser/resources/options/content_settings_exceptions_area.js +++ b/chrome/browser/resources/options/content_settings_exceptions_area.js @@ -499,7 +499,7 @@ cr.define('options.contentSettings', function() { /** * Sets the exceptions in the js model. * - * @param {Array.<options.Exception>} entries A list of dictionaries of + * @param {Array<options.Exception>} entries A list of dictionaries of * values, each dictionary represents an exception. */ setExceptions: function(entries) { diff --git a/chrome/browser/resources/options/cookies_list.js b/chrome/browser/resources/options/cookies_list.js index 2784558..767b5a9 100644 --- a/chrome/browser/resources/options/cookies_list.js +++ b/chrome/browser/resources/options/cookies_list.js @@ -65,9 +65,9 @@ cr.define('options', function() { /** * Create tree nodes for the objects in the data array, and insert them all * 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 {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.<options.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); }); @@ -396,7 +396,7 @@ cr.define('options', function() { /** * Insert the given list of cookie tree nodes at the given index. * Both CookiesList and CookieTreeNode implement this API. - * @param {Array.<Object>} data The data objects for the nodes to add. + * @param {Array<Object>} data The data objects for the nodes to add. * @param {number} start The index at which to start inserting the nodes. */ insertAt: function(data, start) { @@ -554,7 +554,7 @@ cr.define('options', function() { * Uses preallocated DOM elements for each cookie node type from @{code * infoNodes}, and inserts the appropriate elements to @{code element}. * @param {Element} element The DOM element to insert elements to. - * @param {Object.<string, {table: Element, info: Object.<string, + * @param {Object<string, {table: Element, info: Object<string, * Element>}>} infoNodes The map from cookie node types to maps from * cookie attribute names to DOM elements to display cookie attribute * values, created by @{code CookiesList.decorate}. @@ -829,7 +829,7 @@ cr.define('options', function() { /** * Insert the given list of cookie tree nodes at the given index. * Both CookiesList and CookieTreeNode implement this API. - * @param {Array.<Object>} data The data objects for the nodes to add. + * @param {Array<Object>} data The data objects for the nodes to add. * @param {number} start The index at which to start inserting the nodes. */ insertAt: function(data, start) { diff --git a/chrome/browser/resources/options/handler_options.js b/chrome/browser/resources/options/handler_options.js index 8597834..a01261f 100644 --- a/chrome/browser/resources/options/handler_options.js +++ b/chrome/browser/resources/options/handler_options.js @@ -76,7 +76,7 @@ cr.define('options', function() { /** * Sets the list of handlers shown by the view. - * @param {Array.<Handlers>} handlers Handlers to be shown in the view. + * @param {Array<Handlers>} handlers Handlers to be shown in the view. */ HandlerOptions.setHandlers = function(handlers) { $('handlers-list').setHandlers(handlers); diff --git a/chrome/browser/resources/options/language_add_language_overlay.js b/chrome/browser/resources/options/language_add_language_overlay.js index 313feee..9197ecd 100644 --- a/chrome/browser/resources/options/language_add_language_overlay.js +++ b/chrome/browser/resources/options/language_add_language_overlay.js @@ -38,7 +38,7 @@ cr.define('options', function() { // Create the language list with which users can add a language. var addLanguageList = $('add-language-overlay-language-list'); /** - * @type {Array.<{code: string, displayName: string, + * @type {Array<{code: string, displayName: string, * textDirection: string, nativeDisplayName: string}>} * @see chrome/browser/ui/webui/options/language_options_handler.cc */ diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js index f402844..7956e85 100644 --- a/chrome/browser/resources/options/language_options.js +++ b/chrome/browser/resources/options/language_options.js @@ -1349,7 +1349,7 @@ cr.define('options', function() { /** * Shows the node at |index| in |nodes|, hides all others. - * @param {Array.<HTMLElement>} nodes The nodes to be shown or hidden. + * @param {Array<HTMLElement>} nodes The nodes to be shown or hidden. * @param {number} index The index of |nodes| to show. */ function showMutuallyExclusiveNodes(nodes, index) { diff --git a/chrome/browser/resources/options/manage_profile_overlay.js b/chrome/browser/resources/options/manage_profile_overlay.js index 7de8eb3..0be7f9f 100644 --- a/chrome/browser/resources/options/manage_profile_overlay.js +++ b/chrome/browser/resources/options/manage_profile_overlay.js @@ -216,8 +216,8 @@ 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>} names An array of default names + * @param {!Array<string>} iconURLs An array of icon URLs. + * @param {Array<string>} names An array of default names * corresponding to the icons. * @private */ @@ -380,7 +380,7 @@ cr.define('options', function() { * user. If yes, the user is prompted to import the existing supervised * user, and the create button is disabled. * If the received list is empty, hides the "import" link. - * @param {Array.<Object>} supervisedUsers The list of existing supervised + * @param {Array<Object>} supervisedUsers The list of existing supervised * users. * @private */ diff --git a/chrome/browser/resources/options/search_page.js b/chrome/browser/resources/options/search_page.js index 27cd9a5..971546d 100644 --- a/chrome/browser/resources/options/search_page.js +++ b/chrome/browser/resources/options/search_page.js @@ -383,7 +383,7 @@ cr.define('options', function() { }, /** - * @return {!Array.<HTMLElement>} all the associated controls for |subpage|, + * @return {!Array<HTMLElement>} all the associated controls for |subpage|, * including |subpage.associatedControls| as well as any controls on parent * pages that are indirectly necessary to get to the subpage. * @private diff --git a/chrome/browser/resources/options/supervised_user_import.js b/chrome/browser/resources/options/supervised_user_import.js index 43226e2..e6b436a 100644 --- a/chrome/browser/resources/options/supervised_user_import.js +++ b/chrome/browser/resources/options/supervised_user_import.js @@ -175,7 +175,7 @@ cr.define('options', function() { /** * Sets the data model of the supervised user list to |supervisedUsers|. - * @param {Array.<{id: string, name: string, iconURL: string, + * @param {Array<{id: string, name: string, iconURL: string, * onCurrentDevice: boolean, needAvatar: boolean}>} supervisedUsers * Array of supervised user objects. * @private diff --git a/chrome/browser/resources/options/supervised_user_list_data.js b/chrome/browser/resources/options/supervised_user_list_data.js index 812620e..67ac67e 100644 --- a/chrome/browser/resources/options/supervised_user_list_data.js +++ b/chrome/browser/resources/options/supervised_user_list_data.js @@ -20,7 +20,7 @@ cr.define('options', function() { /** * Receives a list of supervised users and resolves the promise. - * @param {Array.<Object>} supervisedUsers Array of supervised user objects. + * @param {Array<Object>} supervisedUsers Array of supervised user objects. * Each object is of the form: * supervisedUser = { * id: "Supervised User ID", @@ -97,7 +97,7 @@ cr.define('options', function() { /** * Initializes |promise| with the new data and also passes the new data to * observers. - * @param {Array.<Object>} supervisedUsers Array of supervised user objects. + * @param {Array<Object>} supervisedUsers Array of supervised user objects. * For the format of the objects, see receiveExistingSupervisedUsers_(). * @private */ diff --git a/chrome/browser/resources/pdf/pdf_scripting_api.js b/chrome/browser/resources/pdf/pdf_scripting_api.js index c0b06d1..84b94b1 100644 --- a/chrome/browser/resources/pdf/pdf_scripting_api.js +++ b/chrome/browser/resources/pdf/pdf_scripting_api.js @@ -151,7 +151,7 @@ PDFScriptingAPI.prototype = { * Resets the PDF viewer into print preview mode. * @param {string} url the url of the PDF to load. * @param {boolean} grayscale whether or not to display the PDF in grayscale. - * @param {Array.<number>} pageNumbers an array of the page numbers. + * @param {Array<number>} pageNumbers an array of the page numbers. * @param {boolean} modifiable whether or not the document is modifiable. */ resetPrintPreviewMode: function(url, grayscale, pageNumbers, modifiable) { diff --git a/chrome/browser/resources/print_preview/cloud_print_interface.js b/chrome/browser/resources/print_preview/cloud_print_interface.js index e918cda..32ac59f 100644 --- a/chrome/browser/resources/print_preview/cloud_print_interface.js +++ b/chrome/browser/resources/print_preview/cloud_print_interface.js @@ -52,7 +52,7 @@ cr.define('cloudprint', function() { /** * Currently logged in users (identified by email) mapped to the Google * session index. - * @type {!Object.<string, number>} + * @type {!Object<string, number>} * @private */ this.userSessionIndex_ = {}; @@ -60,21 +60,21 @@ cr.define('cloudprint', function() { /** * Stores last received XSRF tokens for each user account. Sent as * a parameter with every request. - * @type {!Object.<string, string>} + * @type {!Object<string, string>} * @private */ this.xsrfTokens_ = {}; /** * Pending requests delayed until we get access token. - * @type {!Array.<!CloudPrintRequest>} + * @type {!Array<!CloudPrintRequest>} * @private */ this.requestQueue_ = []; /** * Outstanding cloud destination search requests. - * @type {!Array.<!CloudPrintRequest>} + * @type {!Array<!CloudPrintRequest>} * @private */ this.outstandingCloudSearchRequests_ = []; @@ -157,7 +157,7 @@ cr.define('cloudprint', function() { /** * Could Print origins used to search printers. - * @type {!Array.<!print_preview.Destination.Origin>} + * @type {!Array<!print_preview.Destination.Origin>} * @const * @private */ @@ -212,7 +212,7 @@ cr.define('cloudprint', function() { * @param {string} account Account the search is sent for. It matters for * COOKIES origin only, and can be empty (sent on behalf of the primary * user in this case). - * @param {!Array.<!print_preview.Destination.Origin>} origins Origins to + * @param {!Array<!print_preview.Destination.Origin>} origins Origins to * search printers for. * @private */ @@ -374,7 +374,7 @@ cr.define('cloudprint', function() { * Builds request to the Google Cloud Print API. * @param {string} method HTTP method of the request. * @param {string} action Google Cloud Print action to perform. - * @param {Array.<!HttpParam>} params HTTP parameters to include in the + * @param {Array<!HttpParam>} params HTTP parameters to include in the * request. * @param {!print_preview.Destination.Origin} origin Origin for destination. * @param {?string} account Account the request is sent for. Can be @@ -502,7 +502,7 @@ cr.define('cloudprint', function() { /** * Terminates search requests for requested {@code origins}. - * @param {!Array.<print_preview.Destination.Origin>} origins Origins + * @param {!Array<print_preview.Destination.Origin>} origins Origins * to terminate search requests for. * @private */ diff --git a/chrome/browser/resources/print_preview/component.js b/chrome/browser/resources/print_preview/component.js index 2238ab0..3c18829 100644 --- a/chrome/browser/resources/print_preview/component.js +++ b/chrome/browser/resources/print_preview/component.js @@ -31,7 +31,7 @@ cr.define('print_preview', function() { /** * Child components of the component. - * @type {!Array.<!print_preview.Component>} + * @type {!Array<!print_preview.Component>} * @private */ this.children_ = []; @@ -119,7 +119,7 @@ cr.define('print_preview', function() { }, /** - * @return {!Array.<!print_preview.Component>} Child components of this + * @return {!Array<!print_preview.Component>} Child components of this * component. */ get children() { diff --git a/chrome/browser/resources/print_preview/data/app_state.js b/chrome/browser/resources/print_preview/data/app_state.js index 6d90373..00c4c05 100644 --- a/chrome/browser/resources/print_preview/data/app_state.js +++ b/chrome/browser/resources/print_preview/data/app_state.js @@ -83,7 +83,7 @@ cr.define('print_preview', function() { }, /** - * @return {?print_preview.Destination.Origin.<string>} Origin of the + * @return {?print_preview.Destination.Origin<string>} Origin of the * selected destination. */ get selectedDestinationOrigin() { diff --git a/chrome/browser/resources/print_preview/data/destination.js b/chrome/browser/resources/print_preview/data/destination.js index a644acb..6daad81 100644 --- a/chrome/browser/resources/print_preview/data/destination.js +++ b/chrome/browser/resources/print_preview/data/destination.js @@ -11,10 +11,10 @@ cr.exportPath('print_preview'); * @typedef {{ * version: string, * printer: { - * vendor_capability: !Array.<{Object}>, + * vendor_capability: !Array<{Object}>, * collate: ({default: (boolean|undefined)}|undefined), * color: ({ - * option: !Array.<{ + * option: !Array<{ * type: (string|undefined), * vendor_id: (string|undefined), * custom_display_name: (string|undefined), @@ -23,10 +23,10 @@ cr.exportPath('print_preview'); * }|undefined), * copies: ({default: (number|undefined), * max: (number|undefined)}|undefined), - * duplex: ({option: !Array.<{type: (string|undefined), + * duplex: ({option: !Array<{type: (string|undefined), * is_default: (boolean|undefined)}>}|undefined), * page_orientation: ({ - * option: !Array.<{type: (string|undefined), + * option: !Array<{type: (string|undefined), * is_default: (boolean|undefined)}> * }|undefined) * } @@ -48,7 +48,7 @@ cr.define('print_preview', function() { * @param {boolean} isRecent Whether the destination has been used recently. * @param {!print_preview.Destination.ConnectionStatus} connectionStatus * Connection status of the print destination. - * @param {{tags: (Array.<string>|undefined), + * @param {{tags: (Array<string>|undefined), * isOwned: (boolean|undefined), * account: (string|undefined), * lastAccessTime: (number|undefined), @@ -93,7 +93,7 @@ cr.define('print_preview', function() { /** * Tags associated with the destination. - * @private {!Array.<string>} + * @private {!Array<string>} */ this.tags_ = (opt_params && opt_params.tags) || []; @@ -164,7 +164,7 @@ cr.define('print_preview', function() { /** * Prefix of the location destination tag. - * @type {!Array.<string>} + * @type {!Array<string>} * @const */ Destination.LOCATION_TAG_PREFIXES = [ @@ -346,7 +346,7 @@ cr.define('print_preview', function() { return this.location || this.description; }, - /** @return {!Array.<string>} Tags associated with the destination. */ + /** @return {!Array<string>} Tags associated with the destination. */ get tags() { return this.tags_.slice(0); }, @@ -471,7 +471,7 @@ cr.define('print_preview', function() { }, /** - * @return {!Array.<string>} Properties (besides display name) to match + * @return {!Array<string>} Properties (besides display name) to match * search queries against. */ get extraPropertiesToMatch() { diff --git a/chrome/browser/resources/print_preview/data/destination_store.js b/chrome/browser/resources/print_preview/data/destination_store.js index 267cb8b..ef1c4e3 100644 --- a/chrome/browser/resources/print_preview/data/destination_store.js +++ b/chrome/browser/resources/print_preview/data/destination_store.js @@ -48,14 +48,14 @@ cr.define('print_preview', function() { /** * Internal backing store for the data store. - * @type {!Array.<!print_preview.Destination>} + * @type {!Array<!print_preview.Destination>} * @private */ this.destinations_ = []; /** * Cache used for constant lookup of destinations by origin and id. - * @type {Object.<string, !print_preview.Destination>} + * @type {Object<string, !print_preview.Destination>} * @private */ this.destinationMap_ = {}; @@ -100,7 +100,7 @@ cr.define('print_preview', function() { /** * Maps user account to the list of origins for which destinations are * already loaded. - * @type {!Object.<string, Array.<print_preview.Destination.Origin>>} + * @type {!Object<string, Array<print_preview.Destination.Origin>>} * @private */ this.loadedCloudOrigins_ = {}; @@ -267,7 +267,7 @@ cr.define('print_preview', function() { /** * @param {string=} opt_account Account to filter destinations by. When * omitted, all destinations are returned. - * @return {!Array.<!print_preview.Destination>} List of destinations + * @return {!Array<!print_preview.Destination>} List of destinations * accessible by the {@code account}. */ destinations: function(opt_account) { @@ -629,7 +629,7 @@ cr.define('print_preview', function() { /** * Inserts multiple {@code destinations} to the data store and dispatches * single DESTINATIONS_INSERTED event. - * @param {!Array.<print_preview.Destination>} destinations Print + * @param {!Array<print_preview.Destination>} destinations Print * destinations to insert. * @private */ diff --git a/chrome/browser/resources/print_preview/data/invitation_store.js b/chrome/browser/resources/print_preview/data/invitation_store.js index 8072036..86ba438 100644 --- a/chrome/browser/resources/print_preview/data/invitation_store.js +++ b/chrome/browser/resources/print_preview/data/invitation_store.js @@ -22,14 +22,14 @@ cr.define('print_preview', function() { /** * Maps user account to the list of invitations for this account. - * @private {!Object.<string, !Array.<!print_preview.Invitation>>} + * @private {!Object<string, !Array<!print_preview.Invitation>>} */ this.invitations_ = {}; /** * Maps user account to the flag whether the invitations for this account * were successfully loaded. - * @private {!Object.<string, print_preview.InvitationStore.LoadStatus_>} + * @private {!Object<string, print_preview.InvitationStore.LoadStatus_>} */ this.loadStatus_ = {}; @@ -87,7 +87,7 @@ cr.define('print_preview', function() { /** * @param {string} account Account to filter invitations by. - * @return {!Array.<!print_preview.Invitation>} List of invitations for the + * @return {!Array<!print_preview.Invitation>} List of invitations for the * {@code account}. */ invitations: function(account) { diff --git a/chrome/browser/resources/print_preview/data/local_parsers.js b/chrome/browser/resources/print_preview/data/local_parsers.js index c7c3e19..a613178 100644 --- a/chrome/browser/resources/print_preview/data/local_parsers.js +++ b/chrome/browser/resources/print_preview/data/local_parsers.js @@ -37,7 +37,7 @@ cr.define('print_preview', function() { /** * Parses a privet destination as one or more local printers. * @param {!Object} destinationInfo Object that describes a privet printer. - * @return {!Array.<!print_preview.Destination>} Parsed destination info. + * @return {!Array<!print_preview.Destination>} Parsed destination info. */ PrivetDestinationParser.parse = function(destinationInfo) { var returnedPrinters = []; diff --git a/chrome/browser/resources/print_preview/data/margins.js b/chrome/browser/resources/print_preview/data/margins.js index 2b54971..c09c0d5 100644 --- a/chrome/browser/resources/print_preview/data/margins.js +++ b/chrome/browser/resources/print_preview/data/margins.js @@ -16,7 +16,7 @@ cr.define('print_preview', function() { function Margins(top, right, bottom, left) { /** * Backing store for the margin values in points. - * @type {!Object.< + * @type {!Object< * !print_preview.ticket_items.CustomMargins.Orientation, number>} * @private */ diff --git a/chrome/browser/resources/print_preview/data/measurement_system.js b/chrome/browser/resources/print_preview/data/measurement_system.js index ef28f86..6acab16 100644 --- a/chrome/browser/resources/print_preview/data/measurement_system.js +++ b/chrome/browser/resources/print_preview/data/measurement_system.js @@ -24,7 +24,7 @@ cr.define('print_preview', function() { * Parses |numberFormat| and extracts the symbols used for the thousands point * and decimal point. * @param {string} numberFormat The formatted version of the number 12345678. - * @return {!Array.<string>} The extracted symbols in the order + * @return {!Array<string>} The extracted symbols in the order * [thousandsSymbol, decimalSymbol]. For example, * parseNumberFormat("123,456.78") returns [",", "."]. */ @@ -48,7 +48,7 @@ cr.define('print_preview', function() { /** * Maximum resolution of local unit values. - * @type {!Object.<!print_preview.MeasurementSystem.UnitType, number>} + * @type {!Object<!print_preview.MeasurementSystem.UnitType, number>} * @private */ MeasurementSystem.Precision_ = {}; @@ -57,7 +57,7 @@ cr.define('print_preview', function() { /** * Maximum number of decimal places to keep for local unit. - * @type {!Object.<!print_preview.MeasurementSystem.UnitType, number>} + * @type {!Object<!print_preview.MeasurementSystem.UnitType, number>} * @private */ MeasurementSystem.DecimalPlaces_ = {}; diff --git a/chrome/browser/resources/print_preview/data/page_number_set.js b/chrome/browser/resources/print_preview/data/page_number_set.js index 3dd7827..2b081a6 100644 --- a/chrome/browser/resources/print_preview/data/page_number_set.js +++ b/chrome/browser/resources/print_preview/data/page_number_set.js @@ -7,14 +7,14 @@ cr.define('print_preview', function() { /** * An immutable ordered set of page numbers. - * @param {!Array.<number>} pageNumberList A list of page numbers to include + * @param {!Array<number>} pageNumberList A list of page numbers to include * in the set. * @constructor */ function PageNumberSet(pageNumberList) { /** * Internal data store for the page number set. - * @type {!Array.<number>} + * @type {!Array<number>} * @private */ this.pageNumberSet_ = pageListToPageSet(pageNumberList); @@ -51,7 +51,7 @@ cr.define('print_preview', function() { return this.pageNumberSet_.indexOf(pageNumber); }, - /** @return {!Array.<number>} Array representation of the set. */ + /** @return {!Array<number>} Array representation of the set. */ asArray: function() { return this.pageNumberSet_.slice(0); }, diff --git a/chrome/browser/resources/print_preview/data/print_ticket_store.js b/chrome/browser/resources/print_preview/data/print_ticket_store.js index e2e6941..66414b4 100644 --- a/chrome/browser/resources/print_preview/data/print_ticket_store.js +++ b/chrome/browser/resources/print_preview/data/print_ticket_store.js @@ -376,7 +376,7 @@ cr.define('print_preview', function() { if (this.appState_.hasField( print_preview.AppState.Field.VENDOR_OPTIONS)) { this.vendorItems_.updateValue( - /** @type {!Object.<string, string>} */(this.appState_.getField( + /** @type {!Object<string, string>} */(this.appState_.getField( print_preview.AppState.Field.VENDOR_OPTIONS))); } }, diff --git a/chrome/browser/resources/print_preview/data/ticket_items/color.js b/chrome/browser/resources/print_preview/data/ticket_items/color.js index 11ddd7f..b1cbe38 100644 --- a/chrome/browser/resources/print_preview/data/ticket_items/color.js +++ b/chrome/browser/resources/print_preview/data/ticket_items/color.js @@ -24,13 +24,13 @@ cr.define('print_preview.ticket_items', function() { }; /** - * @private {!Array.<string>} List of capability types considered color. + * @private {!Array<string>} List of capability types considered color. * @const */ Color.COLOR_TYPES_ = ['STANDARD_COLOR', 'CUSTOM_COLOR']; /** - * @private {!Array.<string>} List of capability types considered monochrome. + * @private {!Array<string>} List of capability types considered monochrome. * @const */ Color.MONOCHROME_TYPES_ = ['STANDARD_MONOCHROME', 'CUSTOM_MONOCHROME']; @@ -114,9 +114,9 @@ cr.define('print_preview.ticket_items', function() { }, /** - * @param {!Array.<!Object.<{type: (string|undefined), + * @param {!Array<!Object<{type: (string|undefined), * is_default: (boolean|undefined)}>>} options - * @return {Object.<{type: (string|undefined), + * @return {Object<{type: (string|undefined), * is_default: (boolean|undefined)}>} Default color * option of the given list. * @private diff --git a/chrome/browser/resources/print_preview/data/ticket_items/custom_margins.js b/chrome/browser/resources/print_preview/data/ticket_items/custom_margins.js index 9e4fc4f..38ffc00 100644 --- a/chrome/browser/resources/print_preview/data/ticket_items/custom_margins.js +++ b/chrome/browser/resources/print_preview/data/ticket_items/custom_margins.js @@ -37,7 +37,7 @@ cr.define('print_preview.ticket_items', function() { /** * Mapping of a margin orientation to its opposite. - * @type {!Object.<!print_preview.ticket_items.CustomMargins.Orientation, + * @type {!Object<!print_preview.ticket_items.CustomMargins.Orientation, * !print_preview.ticket_items.CustomMargins.Orientation>} * @private */ diff --git a/chrome/browser/resources/print_preview/data/ticket_items/page_range.js b/chrome/browser/resources/print_preview/data/ticket_items/page_range.js index 013263b..bbb3f82 100644 --- a/chrome/browser/resources/print_preview/data/ticket_items/page_range.js +++ b/chrome/browser/resources/print_preview/data/ticket_items/page_range.js @@ -65,7 +65,7 @@ cr.define('print_preview.ticket_items', function() { }, /** - * @return {!Array.<Object.<{from: number, to: number}>>} A list of page + * @return {!Array<Object<{from: number, to: number}>>} A list of page * ranges. */ getPageRanges: function() { @@ -73,7 +73,7 @@ cr.define('print_preview.ticket_items', function() { }, /** - * @return {!Array.<object.<{from: number, to: number}>>} A list of page + * @return {!Array<object<{from: number, to: number}>>} A list of page * ranges suitable for use in the native layer. * TODO(vitalybuka): this should be removed when native layer switched to * page ranges. diff --git a/chrome/browser/resources/print_preview/data/ticket_items/vendor_items.js b/chrome/browser/resources/print_preview/data/ticket_items/vendor_items.js index b347ff8..e3cf19f 100644 --- a/chrome/browser/resources/print_preview/data/ticket_items/vendor_items.js +++ b/chrome/browser/resources/print_preview/data/ticket_items/vendor_items.js @@ -37,7 +37,7 @@ cr.define('print_preview.ticket_items', function() { /** * Vendor ticket items store, maps item id to the item value. - * @private {!Object.<string, string>} + * @private {!Object<string, string>} */ this.items_ = {}; }; @@ -78,14 +78,14 @@ cr.define('print_preview.ticket_items', function() { /** * Vendor ticket items store, maps item id to the item value. - * @return {!Object.<string, string>} + * @return {!Object<string, string>} */ get ticketItems() { return this.items_; }, /** - * @param {!Object.<string, string>} values Values to set as the values of + * @param {!Object<string, string>} values Values to set as the values of * vendor ticket items. Maps vendor item id to the value. */ updateValue: function(values) { diff --git a/chrome/browser/resources/print_preview/data/user_info.js b/chrome/browser/resources/print_preview/data/user_info.js index 88967ce..0d7ade2 100644 --- a/chrome/browser/resources/print_preview/data/user_info.js +++ b/chrome/browser/resources/print_preview/data/user_info.js @@ -24,7 +24,7 @@ cr.define('print_preview', function() { /** * Email addresses of the logged in users or empty array if no user is * logged in. {@code null} if not known yet. - * @private {?Array.<string>} + * @private {?Array<string>} */ this.users_ = null; }; @@ -68,7 +68,7 @@ cr.define('print_preview', function() { }, /** - * @return {?Array.<string>} Email addresses of the logged in users or + * @return {?Array<string>} Email addresses of the logged in users or * empty array if no user is logged in. {@code null} if not known yet. */ get users() { @@ -78,7 +78,7 @@ cr.define('print_preview', function() { /** * Sets logged in user accounts info. * @param {string} activeUser Active user account (email). - * @param {!Array.<string>} users List of currently logged in accounts. + * @param {!Array<string>} users List of currently logged in accounts. */ setUsers: function(activeUser, users) { this.activeUser_ = activeUser; diff --git a/chrome/browser/resources/print_preview/native_layer.js b/chrome/browser/resources/print_preview/native_layer.js index 63477e1..b148a1b 100644 --- a/chrome/browser/resources/print_preview/native_layer.js +++ b/chrome/browser/resources/print_preview/native_layer.js @@ -764,7 +764,7 @@ cr.define('print_preview', function() { }, /** - * @param {Array.<!{extensionId: string, + * @param {Array<!{extensionId: string, * id: string, * name: string, * description: (string|undefined)}>} printers The list diff --git a/chrome/browser/resources/print_preview/preview_generator.js b/chrome/browser/resources/print_preview/preview_generator.js index bcbe95f..597300f 100644 --- a/chrome/browser/resources/print_preview/preview_generator.js +++ b/chrome/browser/resources/print_preview/preview_generator.js @@ -94,7 +94,7 @@ cr.define('print_preview', function() { /** * Page ranges setting used used to generate the last preview. - * @type {!Array.<object.<{from: number, to: number}>>} + * @type {!Array<object<{from: number, to: number}>>} * @private */ this.pageRanges_ = null; diff --git a/chrome/browser/resources/print_preview/previewarea/margin_control_container.js b/chrome/browser/resources/print_preview/previewarea/margin_control_container.js index af9d3fa..5615cdd 100644 --- a/chrome/browser/resources/print_preview/previewarea/margin_control_container.js +++ b/chrome/browser/resources/print_preview/previewarea/margin_control_container.js @@ -62,7 +62,7 @@ cr.define('print_preview', function() { /** * Convenience array that contains all of the margin controls. - * @type {!Object.< + * @type {!Object< * !print_preview.ticket_items.CustomMargins.Orientation, * !print_preview.MarginControl>} * @private diff --git a/chrome/browser/resources/print_preview/previewarea/preview_area.js b/chrome/browser/resources/print_preview/previewarea/preview_area.js index e437621..1aecde5 100644 --- a/chrome/browser/resources/print_preview/previewarea/preview_area.js +++ b/chrome/browser/resources/print_preview/previewarea/preview_area.js @@ -232,7 +232,7 @@ cr.define('print_preview', function() { /** * Maps message IDs to the CSS class that contains them. - * @type {Object.<print_preview.PreviewArea.MessageId_, string>} + * @type {Object<print_preview.PreviewArea.MessageId_, string>} * @private */ PreviewArea.MessageIdClassMap_ = {}; diff --git a/chrome/browser/resources/print_preview/print_preview_utils.js b/chrome/browser/resources/print_preview/print_preview_utils.js index fb7f458..49a367b 100644 --- a/chrome/browser/resources/print_preview/print_preview_utils.js +++ b/chrome/browser/resources/print_preview/print_preview_utils.js @@ -23,8 +23,8 @@ function isPositiveInteger(value) { /** * Returns true if the contents of the two arrays are equal. - * @param {Array.<{from: number, to: number}>} array1 The first array. - * @param {Array.<{from: number, to: number}>} array2 The second array. + * @param {Array<{from: number, to: number}>} array1 The first array. + * @param {Array<{from: number, to: number}>} array2 The second array. * @return {boolean} true if the arrays are equal. */ function areArraysEqual(array1, array2) { @@ -56,8 +56,8 @@ function areRangesEqual(array1, array2) { /** * Removes duplicate elements from |inArray| and returns a new array. * |inArray| is not affected. It assumes that |inArray| is already sorted. - * @param {!Array.<number>} inArray The array to be processed. - * @return {!Array.<number>} The array after processing. + * @param {!Array<number>} inArray The array to be processed. + * @return {!Array<number>} The array after processing. */ function removeDuplicates(inArray) { var out = []; @@ -94,7 +94,7 @@ function removeDuplicates(inArray) { * Example: "1-4dsf, 11" is invalid regardless of |totalPageCount|. * @param {string} pageRangeText The text to be checked. * @param {number=} opt_totalPageCount The total number of pages. - * @return {Array.<{from: number, to: number}>} An array of page range objects. + * @return {Array<{from: number, to: number}>} An array of page range objects. */ function pageRangeTextToPageRanges(pageRangeText, opt_totalPageCount) { if (pageRangeText == '') { @@ -141,7 +141,7 @@ function pageRangeTextToPageRanges(pageRangeText, opt_totalPageCount) { * See pageRangeTextToPageRanges for details. * @param {string} pageRangeText The text to be checked. * @param {number} totalPageCount The total number of pages. - * @return {Array.<number>} A list of all pages. + * @return {Array<number>} A list of all pages. */ function pageRangeTextToPageList(pageRangeText, totalPageCount) { var pageRanges = pageRangeTextToPageRanges(pageRangeText, totalPageCount); @@ -162,8 +162,8 @@ function pageRangeTextToPageList(pageRangeText, totalPageCount) { } /** - * @param {!Array.<number>} pageList The list to be processed. - * @return {!Array.<number>} The contents of |pageList| in ascending order and + * @param {!Array<number>} pageList The list to be processed. + * @return {!Array<number>} The contents of |pageList| in ascending order and * without any duplicates. |pageList| is not affected. */ function pageListToPageSet(pageList) { diff --git a/chrome/browser/resources/print_preview/search/destination_list.js b/chrome/browser/resources/print_preview/search/destination_list.js index d4e1ad0..cffe09c 100644 --- a/chrome/browser/resources/print_preview/search/destination_list.js +++ b/chrome/browser/resources/print_preview/search/destination_list.js @@ -45,14 +45,14 @@ cr.define('print_preview', function() { /** * Backing store for the destination list. - * @type {!Array.<print_preview.Destination>} + * @type {!Array<print_preview.Destination>} * @private */ this.destinations_ = []; /** * Set of destination ids. - * @type {!Object.<string, boolean>} + * @type {!Object<string, boolean>} * @private */ this.destinationIds_ = {}; @@ -80,7 +80,7 @@ cr.define('print_preview', function() { /** * List items representing destinations. - * @type {!Array.<!print_preview.DestinationListItem>} + * @type {!Array<!print_preview.DestinationListItem>} * @private */ this.listItems_ = []; @@ -198,7 +198,7 @@ cr.define('print_preview', function() { /** * Updates the destinations to render in the destination list. - * @param {!Array.<print_preview.Destination>} destinations Destinations to + * @param {!Array<print_preview.Destination>} destinations Destinations to * render. */ updateDestinations: function(destinations) { @@ -251,7 +251,7 @@ cr.define('print_preview', function() { /** * Renders all destinations in the given list. - * @param {!Array.<print_preview.Destination>} destinations List of + * @param {!Array<print_preview.Destination>} destinations List of * destinations to render. * @private */ diff --git a/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings.js b/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings.js index b46218c..892dbc8 100644 --- a/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings.js +++ b/chrome/browser/resources/print_preview/settings/advanced_settings/advanced_settings.js @@ -35,7 +35,7 @@ cr.define('print_preview', function() { /** @private {print_preview.Destination} */ this.destination_ = null; - /** @private {!Array.<!print_preview.AdvancedSettingsItem>} */ + /** @private {!Array<!print_preview.AdvancedSettingsItem>} */ this.items_ = []; }; diff --git a/chrome/browser/resources/print_preview/settings/more_settings.js b/chrome/browser/resources/print_preview/settings/more_settings.js index 580b56a..c8e3662 100644 --- a/chrome/browser/resources/print_preview/settings/more_settings.js +++ b/chrome/browser/resources/print_preview/settings/more_settings.js @@ -9,7 +9,7 @@ cr.define('print_preview', function() { * Toggles visibility of the specified printing options sections. * @param {!print_preview.DestinationStore} destinationStore To listen for * destination changes. - * @param {!Array.<print_preview.SettingsSection>} settingsSections Sections + * @param {!Array<print_preview.SettingsSection>} settingsSections Sections * to toggle by this component. * @constructor * @extends {print_preview.Component} @@ -20,7 +20,7 @@ cr.define('print_preview', function() { /** @private {!print_preview.DestinationStore} */ this.destinationStore_ = destinationStore; - /** @private {!Array.<print_preview.SettingsSection>} */ + /** @private {!Array<print_preview.SettingsSection>} */ this.settingsSections_ = settingsSections; /** @private {MoreSettings.SettingsToShow} */ diff --git a/chrome/browser/resources/quota_internals/event_handler.js b/chrome/browser/resources/quota_internals/event_handler.js index d92926f..89fe355 100644 --- a/chrome/browser/resources/quota_internals/event_handler.js +++ b/chrome/browser/resources/quota_internals/event_handler.js @@ -74,7 +74,7 @@ function stringToText_(value) { * e.g. separateBackward_('abcdefghijk', 4) == ['abc','defg','hijk']; * @param {string} value String to be separated. * @param {number} maxLength Max length of segments. - * @return {Array.<string>} Array of segments. + * @return {Array<string>} Array of segments. * @private */ function separateBackward_(value, maxLength) { @@ -399,7 +399,7 @@ function handlePerOriginInfo(event) { */ function handleStatistics(event) { /** - * @type {Object.<string>} + * @type {Object<string>} */ var data = event.detail; for (var key in data) { diff --git a/chrome/browser/resources/signin_internals/signin_internals.js b/chrome/browser/resources/signin_internals/signin_internals.js index 4f30804..088e066 100644 --- a/chrome/browser/resources/signin_internals/signin_internals.js +++ b/chrome/browser/resources/signin_internals/signin_internals.js @@ -46,7 +46,7 @@ function setClassFromValue(value) { } // Allow signin_index.html to access the functions above using the -// corresponding chrome.signin.<method> calls. +// corresponding chrome.signin<method> calls. chrome.signin['highlightIfChanged'] = highlightIfChanged; chrome.signin['highlightIfAnyChanged'] = highlightIfAnyChanged; chrome.signin['setClassFromValue'] = setClassFromValue; diff --git a/chrome/browser/resources/suggestions_internals/suggestions_internals.js b/chrome/browser/resources/suggestions_internals/suggestions_internals.js index 3598830..63a9ace 100644 --- a/chrome/browser/resources/suggestions_internals/suggestions_internals.js +++ b/chrome/browser/resources/suggestions_internals/suggestions_internals.js @@ -41,7 +41,7 @@ cr.define('suggestionsInternals', function() { /** * A list of columns that we do not want to display. - * @type {Array.<string>} + * @type {Array<string>} * @const */ var IGNORED_COLUMNS = [ @@ -52,7 +52,7 @@ cr.define('suggestionsInternals', function() { * A list specifying the name of the first columns to be displayed. If * present, they will be displayed in this order, followed by the remaining * columns. - * @type {Array.<string>} + * @type {Array<string>} * @const */ var PREFERRED_COLUMN_ORDER = [ @@ -160,8 +160,8 @@ cr.define('suggestionsInternals', function() { } else if (columnName == 'screenshot') { var thumbnailUrl = 'chrome://thumb/' + entry.url; var img = document.createElement('img'); - img.onload = function() { setBooleanColumn(column, true); } - img.onerror = function() { setBooleanColumn(column, false); } + img.onload = function() { setBooleanColumn(column, true); }; + img.onerror = function() { setBooleanColumn(column, false); }; img.src = thumbnailUrl; } else if (columnName == 'favicon') { var faviconUrl = 'chrome://favicon/size/16@1x/' + entry.url; diff --git a/chrome/browser/resources/sync_file_system_internals/utils.js b/chrome/browser/resources/sync_file_system_internals/utils.js index 5e7a351..2cec4fc 100644 --- a/chrome/browser/resources/sync_file_system_internals/utils.js +++ b/chrome/browser/resources/sync_file_system_internals/utils.js @@ -22,7 +22,7 @@ function createElementFromText(elementName, text, opt_attributes) { /** * Creates an element with |tagName| containing the content |dict|. * @param {string} elementName Name of the new element to be created. - * @param {Object.<string, string>} dict Dictionary to be contained in the new + * @param {Object<string, string>} dict Dictionary to be contained in the new * element. * @return {HTMLElement} The newly created HTML element. */ diff --git a/chrome/browser/resources/sync_internals/data.js b/chrome/browser/resources/sync_internals/data.js index 6de42c7..f3729e7 100644 --- a/chrome/browser/resources/sync_internals/data.js +++ b/chrome/browser/resources/sync_internals/data.js @@ -126,7 +126,7 @@ function makeDateUserAgentHeader() { /** * Builds a summary of current state and exports it as a downloaded file. * - * @param {!Array.<{type: string, nodes: !Array<!Object>}>} nodesMap + * @param {!Array<{type: string, nodes: !Array<!Object>}>} nodesMap * Summary of local state by model type. */ function triggerDataDownload(nodesMap) { diff --git a/chrome/browser/resources/uber/uber.js b/chrome/browser/resources/uber/uber.js index 17ccd04..9861806 100644 --- a/chrome/browser/resources/uber/uber.js +++ b/chrome/browser/resources/uber/uber.js @@ -156,7 +156,7 @@ cr.define('uber', function() { * @param {Event} e The posted object. */ function handleWindowMessage(e) { - e = /** @type{!MessageEvent.<!{method: string, params: *}>} */(e); + e = /** @type{!MessageEvent<!{method: string, params: *}>} */(e); if (e.data.method === 'beginInterceptingEvents') { backgroundNavigation(); } else if (e.data.method === 'stopInterceptingEvents') { diff --git a/chrome/browser/resources/uber/uber_utils.js b/chrome/browser/resources/uber/uber_utils.js index d4f30db..9964321 100644 --- a/chrome/browser/resources/uber/uber_utils.js +++ b/chrome/browser/resources/uber/uber_utils.js @@ -67,7 +67,7 @@ cr.define('uber', function() { * @param {Event} e The message event. */ function handleWindowMessage(e) { - e = /** @type {!MessageEvent.<!{method: string, params: *}>} */(e); + e = /** @type {!MessageEvent<!{method: string, params: *}>} */(e); if (e.data.method === 'frameSelected') { handleFrameSelected(); } else if (e.data.method === 'mouseWheel') { diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js index 981cf68..14b9dda 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js @@ -306,7 +306,7 @@ TEST_F('BluetoothWebUITest', 'testMaliciousInput', function() { '>\'>\\"><SCRIPT>alert(1)</SCRIPT>', '<IMG SRC=\\"javascript:alert(1)\\">', '<A HREF=\\"data:text/html;base64,' + - 'PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pgo=\\">...</A>', + 'PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pgo=\\">..</A>', '<div>', '<textarea>', '<style>', diff --git a/chrome/browser/ui/webui/options/options_browsertest.js b/chrome/browser/ui/webui/options/options_browsertest.js index 1e22286..d2c068a 100644 --- a/chrome/browser/ui/webui/options/options_browsertest.js +++ b/chrome/browser/ui/webui/options/options_browsertest.js @@ -413,7 +413,7 @@ OptionsWebUIExtendedTest.prototype = { /** * Verifies that the correct pages are currently open/visible. - * @param {!Array.<string>} expectedPages An array of page names expected to + * @param {!Array<string>} expectedPages An array of page names expected to * be open, with the topmost listed last. * @param {string=} opt_expectedUrl The URL path, including hash, expected to * be open. If undefined, the topmost (last) page name in |expectedPages| @@ -457,7 +457,7 @@ OptionsWebUIExtendedTest.prototype = { /* * Verifies that the correct URLs are listed in the history. Asynchronous. - * @param {!Array.<string>} expectedHistory An array of URL paths expected to + * @param {!Array<string>} expectedHistory An array of URL paths expected to * be in the tab navigation history, sorted by visit time, including the * current page as the last entry. The base URL (chrome://settings-frame/) * will be prepended to each. An initial 'about:blank' history entry is diff --git a/chrome/browser/ui/webui/options/settings_format_browsertest.js b/chrome/browser/ui/webui/options/settings_format_browsertest.js index e71769f..f2f2fa6 100644 --- a/chrome/browser/ui/webui/options/settings_format_browsertest.js +++ b/chrome/browser/ui/webui/options/settings_format_browsertest.js @@ -46,7 +46,7 @@ SettingsFormatWebUITest.prototype = { * to suppress verbosity. The implementation of errorsToMessage in the * testing API generates a call stack for each error produced which greatly * reduces readability. - * @type {Array.<string>} + * @type {Array<string>} */ errors: null, @@ -99,7 +99,7 @@ SettingsFormatWebUITest.prototype = { /** * Checks if the node is exempt from following the formatting rule. * @param {!Element} element The candidate element. - * @param {Array.<string>} filters List of exemptions. + * @param {Array<string>} filters List of exemptions. * @return {boolean} True if the element is exempt. */ isExempt: function(element, filters) { diff --git a/chrome/browser/ui/webui/options/startup_page_list_browsertest.js b/chrome/browser/ui/webui/options/startup_page_list_browsertest.js index c0745a5..866c441 100644 --- a/chrome/browser/ui/webui/options/startup_page_list_browsertest.js +++ b/chrome/browser/ui/webui/options/startup_page_list_browsertest.js @@ -73,7 +73,7 @@ StartupPageListWebUITest.prototype = { function MockDataTransfer() { /** * The data this dataTransfer object knows about. - * @type {!Object.<string, string>} + * @type {!Object<string, string>} * @private */ this.data_ = {}; diff --git a/chrome/renderer/resources/extensions/automation/automation_node.js b/chrome/renderer/resources/extensions/automation/automation_node.js index 9dcf626..709a45a 100644 --- a/chrome/renderer/resources/extensions/automation/automation_node.js +++ b/chrome/renderer/resources/extensions/automation/automation_node.js @@ -352,7 +352,7 @@ var AutomationAttributeTypes = [ /** * Maps an attribute name to another attribute who's value is an id or an array * of ids referencing an AutomationNode. - * @param {!Object.<string, string>} + * @param {!Object<string, string>} * @const */ var ATTRIBUTE_NAME_TO_ID_ATTRIBUTE = { @@ -366,7 +366,7 @@ var ATTRIBUTE_NAME_TO_ID_ATTRIBUTE = { /** * A set of attributes ignored in the automation API. - * @param {!Object.<string, boolean>} + * @param {!Object<string, boolean>} * @const */ var ATTRIBUTE_BLACKLIST = {'activedescendantId': true, diff --git a/chrome/renderer/resources/extensions/file_system_provider_custom_bindings.js b/chrome/renderer/resources/extensions/file_system_provider_custom_bindings.js index 9e1f53c..4bf24f2 100644 --- a/chrome/renderer/resources/extensions/file_system_provider_custom_bindings.js +++ b/chrome/renderer/resources/extensions/file_system_provider_custom_bindings.js @@ -74,8 +74,8 @@ function annotateMetadata(metadata) { /** * Massages arguments of an event raised by the File System Provider API. - * @param {Array.<*>} args Input arguments. - * @param {function(Array.<*>)} dispatch Closure to be called with massaged + * @param {Array<*>} args Input arguments. + * @param {function(Array<*>)} dispatch Closure to be called with massaged * arguments. */ function massageArgumentsDefault(args, dispatch) { diff --git a/chrome/renderer/resources/offline.js b/chrome/renderer/resources/offline.js index 4575a9c..fbf46d9 100644 --- a/chrome/renderer/resources/offline.js +++ b/chrome/renderer/resources/offline.js @@ -141,7 +141,7 @@ Runner.classes = { /** * Image source urls. - * @enum {array.<object>} + * @enum {array<object>} */ Runner.imageSources = { LDPI: [ @@ -969,7 +969,7 @@ GameOverPanel.prototype = { * @param {!Trex} tRex T-rex object. * @param {HTMLCanvasContext} opt_canvasCtx Optional canvas context for drawing * collision boxes. - * @return {Array.<CollisionBox>} + * @return {Array<CollisionBox>} */ function checkForCollision(obstacle, tRex, opt_canvasCtx) { var obstacleBoxXPos = Runner.defaultDimensions.WIDTH + obstacle.xPos; @@ -1344,7 +1344,7 @@ Trex.config = { /** * Used in collision detection. - * @type {Array.<CollisionBox>} + * @type {Array<CollisionBox>} */ Trex.collisionBoxes = [ new CollisionBox(1, -1, 30, 26), @@ -1641,7 +1641,7 @@ DistanceMeter.dimensions = { /** * Y positioning of the digits in the sprite sheet. * X position is always 0. - * @type {array.<number>} + * @type {array<number>} */ DistanceMeter.yPos = [0, 13, 27, 40, 53, 67, 80, 93, 107, 120]; @@ -2070,7 +2070,7 @@ HorizonLine.prototype = { /** * Horizon background class. * @param {HTMLCanvasElement} canvas - * @param {Array.<HTMLImageElement>} images + * @param {Array<HTMLImageElement>} images * @param {object} dimensions Canvas dimensions. * @param {number} gapCoefficient * @constructor diff --git a/chrome/test/base/js2gtest.js b/chrome/test/base/js2gtest.js index c20b934..4e3f8d8 100644 --- a/chrome/test/base/js2gtest.js +++ b/chrome/test/base/js2gtest.js @@ -75,14 +75,14 @@ var testF; /** * Keeps track of whether a typedef has been generated for each test * fixture. - * @type {Object.<string, string>} + * @type {Object<string, string>} */ var typedeffedCppFixtures = {}; /** * Maintains a list of relative file paths to add to each gtest body * for inclusion at runtime before running each JavaScript test. - * @type {Array.<string>} + * @type {Array<string>} */ var genIncludes = []; @@ -181,14 +181,14 @@ function includeFileToPaths(includeFile) { /** * Maps object names to the path to the file that provides them. * Populated from the |depsFile| if any. - * @type {Object.<string, string>} + * @type {Object<string, string>} */ var dependencyProvidesToPaths = {}; /** * Maps dependency path names to object names required by the file. * Populated from the |depsFile| if any. - * @type {Object.<string, Array.<string>>} + * @type {Object<string, Array<string>>} */ var dependencyPathsToRequires = {}; @@ -198,8 +198,8 @@ if (depsFile) { * Called by the javascript in the deps file to add modules and their * dependencies. * @param {string} path Relative path to the file. - * @param Array.<string> provides Objects provided by this file. - * @param Array.<string> requires Objects required by this file. + * @param Array<string> provides Objects provided by this file. + * @param Array<string> requires Objects required by this file. */ goog.addDependency = function(path, provides, requires) { provides.forEach(function(provide) { @@ -219,8 +219,8 @@ if (depsFile) { * by the deps file. Dependencies will be resolved and included in the * correct order, meaning that the returned array may contain more entries * than the input. - * @param {Array.<string>} deps List of dependencies. - * @return {Array.<string>} List of paths to load. + * @param {Array<string>} deps List of dependencies. + * @return {Array<string>} List of paths to load. */ function resolveClosureModuleDeps(deps) { if (!depsFile && deps.length > 0) { @@ -302,7 +302,7 @@ function GEN_BLOCK(commentEncodedCode) { * The paths are allowed to be: * 1. relative to the root src directory (i.e. similar to #include's). * 2. relative to the directory specified in the GYP rule for the file. - * @param {Array.<string>} includes Paths to JavaScript files to + * @param {Array<string>} includes Paths to JavaScript files to * include immediately and at runtime. */ function GEN_INCLUDE(includes) { diff --git a/chrome/test/chromedriver/js/call_function.js b/chrome/test/chromedriver/js/call_function.js index 66f3c57..ab1551b 100644 --- a/chrome/test/chromedriver/js/call_function.js +++ b/chrome/test/chromedriver/js/call_function.js @@ -196,10 +196,10 @@ function unwrap(value, cache) { * between cached object reference IDs and actual JS objects. The cache will * automatically be pruned each call to remove stale references. * - * @param {Array.<string>} shadowHostIds The host ids of the nested shadow + * @param {Array<string>} shadowHostIds The host ids of the nested shadow * DOMs the function should be executed in the context of. * @param {function(...[*]) : *} func The function to invoke. - * @param {!Array.<*>} args The array of arguments to supply to the function, + * @param {!Array<*>} args The array of arguments to supply to the function, * which will be unwrapped before invoking the function. * @param {boolean=} opt_unwrappedReturn Whether the function's return value * should be left unwrapped. diff --git a/chrome/test/chromedriver/js/execute_async_script.js b/chrome/test/chromedriver/js/execute_async_script.js index c55c65b..f022ce5 100644 --- a/chrome/test/chromedriver/js/execute_async_script.js +++ b/chrome/test/chromedriver/js/execute_async_script.js @@ -22,7 +22,7 @@ var ASYNC_INFO_KEY = '$chrome_asyncScriptInfo'; /** * Return the information of asynchronous script execution. * -* @return {Object.<string, ?>} Information of asynchronous script execution. +* @return {Object<string, ?>} Information of asynchronous script execution. */ function getAsyncScriptInfo() { if (!(ASYNC_INFO_KEY in document)) @@ -40,7 +40,7 @@ function getAsyncScriptInfo() { * should be a proper function body. It will be wrapped in a function and * invoked with the given arguments and, as the final argument, a callback * function to invoke to report the asynchronous result. -* @param {!Array.<*>} args Arguments to be passed to the script. +* @param {!Array<*>} args Arguments to be passed to the script. * @param {boolean} isUserSupplied Whether the script is supplied by the user. * If not, UnknownError will be used instead of JavaScriptError if an * exception occurs during the script, and an additional error callback will diff --git a/components/dom_distiller/webui/resources/about_dom_distiller.js b/components/dom_distiller/webui/resources/about_dom_distiller.js index e52fd97..8c84eb8 100644 --- a/components/dom_distiller/webui/resources/about_dom_distiller.js +++ b/components/dom_distiller/webui/resources/about_dom_distiller.js @@ -7,7 +7,7 @@ var domDistiller = { * Callback from the backend with the list of entries to display. * This call will build the entries section of the DOM distiller page, or hide * that section if there are none to display. - * @param {!Array.<string>} entries The entries. + * @param {!Array<string>} entries The entries. */ onReceivedEntries: function(entries) { $('entries-list-loading').classList.add('hidden'); diff --git a/content/browser/resources/media/dump_creator.js b/content/browser/resources/media/dump_creator.js index 15d708b..e412f36 100644 --- a/content/browser/resources/media/dump_creator.js +++ b/content/browser/resources/media/dump_creator.js @@ -32,7 +32,7 @@ var DumpCreator = (function() { 'Download the PeerConnection updates and stats data' + '</button></a></div>' + '<p><label><input type=checkbox>' + - 'Enable diagnostic audio recordings.</label></p>' + + 'Enable diagnostic audio recordings</label></p>' + '<p>A diagnostic audio recording is used for analyzing audio' + ' problems. It contains the audio played out from the speaker and' + ' recorded from the microphone and is saved to the local disk.' + @@ -52,7 +52,7 @@ var DumpCreator = (function() { ' disabled (--disable-audio-track-processing): (1) Only one recording' + ' per render process is supported. (2) When the box is unchecked or' + ' this page is closed, ongoing recordings will continue until the' + - ' call ends or the page with the recording is closed.</p>'; + ' call ends or the page with the recording is closed</p>'; content.getElementsByTagName('a')[0].addEventListener( 'click', this.onDownloadData_.bind(this)); diff --git a/content/browser/resources/media/ssrc_info_manager.js b/content/browser/resources/media/ssrc_info_manager.js index bb99f81..f588e1e 100644 --- a/content/browser/resources/media/ssrc_info_manager.js +++ b/content/browser/resources/media/ssrc_info_manager.js @@ -48,7 +48,7 @@ var SsrcInfoManager = (function() { function SsrcInfoManager() { /** * Map from ssrc id to an object containing all the stream properties. - * @type {!Object.<string, !Object.<string>>} + * @type {!Object<string, !Object<string>>} * @private */ this.streamInfoContainer_ = {}; @@ -133,7 +133,7 @@ var SsrcInfoManager = (function() { /** * @param {string} sdp The ssrc id. - * @return {!Object.<string>} The object containing the ssrc infomation. + * @return {!Object<string>} The object containing the ssrc infomation. */ getStreamInfo: function(ssrc) { return this.streamInfoContainer_[ssrc]; diff --git a/content/browser/resources/media/stats_table.js b/content/browser/resources/media/stats_table.js index 07b5687..a9d2ab0 100644 --- a/content/browser/resources/media/stats_table.js +++ b/content/browser/resources/media/stats_table.js @@ -110,7 +110,7 @@ var StatsTable = (function(ssrcInfoManager) { * * @param {!Element} statsTable Which table to update. * @param {number} time The number of miliseconds since epoch. - * @param {Array.<string>} statsData An array of stats name and value pairs. + * @param {Array<string>} statsData An array of stats name and value pairs. * @private */ addStatsToTable_: function(statsTable, time, statsData) { diff --git a/content/browser/resources/media/webrtc_internals.js b/content/browser/resources/media/webrtc_internals.js index 3a1f9cd..164ef296 100644 --- a/content/browser/resources/media/webrtc_internals.js +++ b/content/browser/resources/media/webrtc_internals.js @@ -117,7 +117,7 @@ function requestStats() { /** * A helper function for getting a peer connection element id. * - * @param {!Object.<string, number>} data The object containing the pid and lid + * @param {!Object<string, number>} data The object containing the pid and lid * of the peer connection. * @return {string} The peer connection element id. */ @@ -174,7 +174,7 @@ function addPeerConnectionUpdate(peerConnectionElement, update) { /** * Removes all information about a peer connection. * - * @param {!Object.<string, number>} data The object containing the pid and lid + * @param {!Object<string, number>} data The object containing the pid and lid * of a peer connection. */ function removePeerConnection(data) { @@ -227,7 +227,7 @@ function updatePeerConnection(data) { /** * Adds the information of all peer connections created so far. * - * @param {Array.<!Object>} data An array of the information of all peer + * @param {Array<!Object>} data An array of the information of all peer * connections. Each array item contains pid, lid, url, rtcConfiguration, * constraints, and an array of updates as the log. */ diff --git a/extensions/renderer/resources/data_receiver.js b/extensions/renderer/resources/data_receiver.js index 8df9d25..a248ffb 100644 --- a/extensions/renderer/resources/data_receiver.js +++ b/extensions/renderer/resources/data_receiver.js @@ -22,7 +22,7 @@ define('data_receiver', [ /** * The promise that will be resolved or rejected when this receive completes * or fails, respectively. - * @type {!Promise.<ArrayBuffer>} + * @type {!Promise<ArrayBuffer>} * @private */ this.promise_ = new Promise(function(resolve, reject) { @@ -44,7 +44,7 @@ define('data_receiver', [ /** * Returns the promise that will be resolved when this operation completes or * rejected if an error occurs. - * @return {Promise.<ArrayBuffer>} A promise to the data received. + * @return {Promise<ArrayBuffer>} A promise to the data received. */ PendingReceive.prototype.getPromise = function() { return this.promise_; @@ -126,7 +126,7 @@ define('data_receiver', [ * @param {number} bytesReceived The number of bytes already received. * @param {PendingReceiveError} pendingError The pending error if there is * one. - * @param {!Array.<!ArrayBuffer>} pendingData Data received from the + * @param {!Array<!ArrayBuffer>} pendingData Data received from the * DataSource not yet requested by the client. * @param {boolean} paused Whether the DataSource is paused. * @private @@ -195,7 +195,7 @@ define('data_receiver', [ /** * Serializes this DataReceiver. * This will cancel a receive if one is in progress. - * @return {!Promise.<SerializedDataReceiver>} A promise that will resolve to + * @return {!Promise<SerializedDataReceiver>} A promise that will resolve to * the serialization of this DataReceiver. If this DataReceiver has shut * down, the promise will resolve to null. */ @@ -259,7 +259,7 @@ define('data_receiver', [ /** * Receive data from the DataSource. - * @return {Promise.<ArrayBuffer>} A promise to the received data. If an error + * @return {Promise<ArrayBuffer>} A promise to the received data. If an error * occurs, the promise will reject with an Error object with a property * error containing the error code. * @throws Will throw if this has encountered a fatal error or another receive diff --git a/extensions/renderer/resources/data_sender.js b/extensions/renderer/resources/data_sender.js index 0fe084f..5fa8708 100644 --- a/extensions/renderer/resources/data_sender.js +++ b/extensions/renderer/resources/data_sender.js @@ -35,7 +35,7 @@ define('data_sender', [ /** * The promise that will be resolved or rejected when this send completes * or fails, respectively. - * @type {!Promise.<number>} + * @type {!Promise<number>} * @private */ this.promise_ = new Promise(function(resolve, reject) { @@ -57,7 +57,7 @@ define('data_sender', [ /** * Returns the promise that will be resolved when this operation completes or * rejected if an error occurs. - * @return {!Promise.<number>} A promise to the number of bytes sent. + * @return {!Promise<number>} A promise to the number of bytes sent. */ PendingSend.prototype.getPromise = function() { return this.promise_; @@ -188,7 +188,7 @@ define('data_sender', [ * Serializes this DataSender. * This will cancel any sends in progress before the returned promise * resolves. - * @return {!Promise.<SerializedDataSender>} A promise that will resolve to + * @return {!Promise<SerializedDataSender>} A promise that will resolve to * the serialization of this DataSender. If this DataSender has shut down, * the promise will resolve to null. */ @@ -241,7 +241,7 @@ define('data_sender', [ /** * Sends data to the DataSink. - * @return {!Promise.<number>} A promise to the number of bytes sent. If an + * @return {!Promise<number>} A promise to the number of bytes sent. If an * error occurs, the promise will reject with an Error object with a * property error containing the error code. * @throws Will throw if this has encountered a fatal error or a cancel is in diff --git a/extensions/renderer/resources/platform_app.js b/extensions/renderer/resources/platform_app.js index 16470a5..280155f 100644 --- a/extensions/renderer/resources/platform_app.js +++ b/extensions/renderer/resources/platform_app.js @@ -61,7 +61,7 @@ function generateThrowingMethodStub(messagePrefix, opt_messageSuffix) { * @param {string} objectName The display name to use in the error message * thrown by the stub (this is the name that the object is commonly referred * to by web developers, e.g. "document" instead of "HTMLDocument"). - * @param {Array.<string>} methodNames names of methods to disable. + * @param {Array<string>} methodNames names of methods to disable. * @param {Boolean} useThrowingStubs if true, the replaced methods will throw * an error instead of silently returning undefined */ @@ -86,7 +86,7 @@ function disableMethods(object, objectName, methodNames, useThrowingStubs) { * thrown by the getter stub (this is the name that the object is commonly * referred to by web developers, e.g. "document" instead of * "HTMLDocument"). - * @param {Array.<string>} propertyNames names of properties to disable. + * @param {Array<string>} propertyNames names of properties to disable. */ function disableGetters(object, objectName, propertyNames, opt_messageSuffix) { $Array.forEach(propertyNames, function(propertyName) { @@ -128,7 +128,7 @@ function disableGetters(object, objectName, propertyNames, opt_messageSuffix) { * thrown by the setter stub (this is the name that the object is commonly * referred to by web developers, e.g. "document" instead of * "HTMLDocument"). - * @param {Array.<string>} propertyNames names of properties to disable. + * @param {Array<string>} propertyNames names of properties to disable. */ function disableSetters(object, objectName, propertyNames, opt_messageSuffix) { $Array.forEach(propertyNames, function(propertyName) { diff --git a/extensions/renderer/resources/stash_client.js b/extensions/renderer/resources/stash_client.js index c24de57..110e700c 100644 --- a/extensions/renderer/resources/stash_client.js +++ b/extensions/renderer/resources/stash_client.js @@ -87,7 +87,7 @@ define('stash_client', [ /** * The registered stash clients. - * @type {!Array.<!Registration>} + * @type {!Array<!Registration>} */ var clients = []; @@ -128,7 +128,7 @@ define('stash_client', [ * client and should be passed as the id to registerClient(). * @param {!Object} type The mojo struct type that was serialized into the * each stashed object. - * @return {!Promise.<!Array<!Object>>} The stashed objects. The exact type of + * @return {!Promise<!Array<!Object>>} The stashed objects. The exact type of * each object is that of the |type| parameter. * @alias module:stash_client.retrieve */ diff --git a/extensions/renderer/resources/utils.js b/extensions/renderer/resources/utils.js index 4420c61..aab266d 100644 --- a/extensions/renderer/resources/utils.js +++ b/extensions/renderer/resources/utils.js @@ -27,7 +27,7 @@ function forEach(obj, f, self) { * Assuming |array_of_dictionaries| is structured like this: * [{id: 1, ... }, {id: 2, ...}, ...], you can use * lookup(array_of_dictionaries, 'id', 2) to get the dictionary with id == 2. - * @param {Array.<Object.<string, ?>>} array_of_dictionaries + * @param {Array<Object<string, ?>>} array_of_dictionaries * @param {string} field * @param {?} value */ @@ -75,9 +75,9 @@ function loadTypeSchema(typeName, defaultSchema) { * @param {string} name The name of the exposed wrapper class. * @param {Object} cls The class implementation. * @param {{superclass: ?Function, - * functions: ?Array.<string>, - * properties: ?Array.<string>, - * readonly: ?Array.<string>}} exposed The names of properties on the + * functions: ?Array<string>, + * properties: ?Array<string>, + * readonly: ?Array<string>}} exposed The names of properties on the * implementation class to be exposed. |superclass| represents the * constructor of the class to be used as the superclass of the exposed * class; |functions| represents the names of functions which should be diff --git a/extensions/test/data/web_view/apitest/main.js b/extensions/test/data/web_view/apitest/main.js index 95fee6e..d973afe 100644 --- a/extensions/test/data/web_view/apitest/main.js +++ b/extensions/test/data/web_view/apitest/main.js @@ -725,16 +725,16 @@ function testExecuteScriptIsAbortedWhenWebViewSourceIsChanged() { function testFindAPI() { var webview = new WebView(); - webview.src = 'data:text/html,Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br><br>' + + webview.src = 'data:text/html,Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br><br>' + '<a href="about:blank">Click here!</a>'; var loadstopListener2 = function(e) { @@ -800,16 +800,16 @@ function testFindAPI() { function testFindAPI_findupdate() { var webview = new WebView(); - webview.src = 'data:text/html,Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br>' + - 'Dog dog dog Dog dog dogcatDog dogDogdog.<br><br>' + + webview.src = 'data:text/html,Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br>' + + 'Dog dog dog Dog dog dogcatDog dogDogdog<br><br>' + '<a href="about:blank">Click here!</a>'; var canceledTest = false; webview.addEventListener('loadstop', function(e) { diff --git a/ios/web/web_state/js/resources/common.js b/ios/web/web_state/js/resources/common.js index 7cf5baa..1cea022 100644 --- a/ios/web/web_state/js/resources/common.js +++ b/ios/web/web_state/js/resources/common.js @@ -90,7 +90,7 @@ new function() { * * @param {Element} form A form element for which the control elements are * returned. - * @return {Array.<Element>} + * @return {Array<Element>} */ __gCrWeb.common.getFormControlElements = function(form) { if (!form) { diff --git a/native_client_sdk/src/examples/benchmarks/example.js b/native_client_sdk/src/examples/benchmarks/example.js index 74737be..62c1c81 100644 --- a/native_client_sdk/src/examples/benchmarks/example.js +++ b/native_client_sdk/src/examples/benchmarks/example.js @@ -36,6 +36,6 @@ function handleMessage(message_event) { common.updateStatus('READY TO RUN'); var window = document.getElementById('result').contentWindow; window.document.writeln('</table>'); - window.document.writeln('Finished.<br><br></samp>'); + window.document.writeln('Finished<br><br></samp>'); } } diff --git a/remoting/tools/javascript_key_tester/chord_tracker.js b/remoting/tools/javascript_key_tester/chord_tracker.js index 9afc26a..29384a0b 100644 --- a/remoting/tools/javascript_key_tester/chord_tracker.js +++ b/remoting/tools/javascript_key_tester/chord_tracker.js @@ -12,7 +12,7 @@ var ChordTracker = function(parentDiv) { this.parentDiv_ = parentDiv; /** @type {HTMLElement} */ this.currentDiv_ = null; - /** @type {Object.<HTMLElement>} */ + /** @type {Object<HTMLElement>} */ this.pressedKeys_ = {}; }; diff --git a/remoting/webapp/app_remoting/js/context_menu_dom.js b/remoting/webapp/app_remoting/js/context_menu_dom.js index 62fa718..01c83b5 100644 --- a/remoting/webapp/app_remoting/js/context_menu_dom.js +++ b/remoting/webapp/app_remoting/js/context_menu_dom.js @@ -103,7 +103,7 @@ remoting.ContextMenuDom = function(root) { }; /** - * @param {Array.<{left: number, top: number, width: number, height: number}>} + * @param {Array<{left: number, top: number, width: number, height: number}>} * rects List of rectangles. */ remoting.ContextMenuDom.prototype.addToRegion = function(rects) { diff --git a/remoting/webapp/app_remoting/js/idle_detector.js b/remoting/webapp/app_remoting/js/idle_detector.js index 58b982d..9d6c58b 100644 --- a/remoting/webapp/app_remoting/js/idle_detector.js +++ b/remoting/webapp/app_remoting/js/idle_detector.js @@ -148,7 +148,7 @@ remoting.IdleDetector.prototype.showIdleWarning_ = function(show) { } /** - * @param {Array.<{left: number, top: number, width: number, height: number}>} + * @param {Array<{left: number, top: number, width: number, height: number}>} * rects List of rectangles. */ remoting.IdleDetector.prototype.addToRegion = function(rects) { diff --git a/remoting/webapp/app_remoting/js/keyboard_layouts_menu.js b/remoting/webapp/app_remoting/js/keyboard_layouts_menu.js index 49ede18..3c82cdb 100644 --- a/remoting/webapp/app_remoting/js/keyboard_layouts_menu.js +++ b/remoting/webapp/app_remoting/js/keyboard_layouts_menu.js @@ -42,7 +42,7 @@ remoting.KeyboardLayoutsMenu = function(adapter) { }; /** - * @param {Array.<string>} layouts The keyboard layouts available on the host, + * @param {Array<string>} layouts The keyboard layouts available on the host, * for example en-US, de-DE * @param {string} currentLayout The layout currently active on the host. */ @@ -98,7 +98,7 @@ remoting.KeyboardLayoutsMenu.prototype.setLayout_ = * will match either en-US or en-GB, whichever appears first). * - Otherwise, use the host's current layout. * - * @param {Array.<string>} layouts + * @param {Array<string>} layouts * @param {string} currentHostLayout * @param {function(string):void} onDone * @private @@ -123,7 +123,7 @@ remoting.KeyboardLayoutsMenu.prototype.getBestLayout_ = } }; - /** @param {Object.<string>} storage */ + /** @param {Object<string>} storage */ var chooseLayout = function(storage) { var configuredLayout = storage[remoting.KeyboardLayoutsMenu.KEY_]; var tryLayouts = [ chrome.i18n.getUILanguage() ]; @@ -170,7 +170,7 @@ remoting.KeyboardLayoutsMenu.prototype.makeMenuId_ = function(layout) { * @private */ remoting.KeyboardLayoutsMenu.prototype.onContextMenu_ = function(info) { - /** @type {Array.<string>} */ + /** @type {Array<string>} */ var components = info.menuItemId.split('@'); if (components.length == 2 && this.makeMenuId_(components[1]) == info.menuItemId) { diff --git a/remoting/webapp/app_remoting/js/window_activation_menu.js b/remoting/webapp/app_remoting/js/window_activation_menu.js index 272aa0f..a279c0b 100644 --- a/remoting/webapp/app_remoting/js/window_activation_menu.js +++ b/remoting/webapp/app_remoting/js/window_activation_menu.js @@ -70,7 +70,7 @@ remoting.WindowActivationMenu.prototype.makeMenuId_ = function(windowId) { * @private */ remoting.WindowActivationMenu.prototype.onContextMenu_ = function(info) { - /** @type {Array.<string>} */ + /** @type {Array<string>} */ var components = info.menuItemId.split('-'); if (components.length == 2 && this.makeMenuId_(parseInt(components[1], 10)) == info.menuItemId) { diff --git a/remoting/webapp/base/js/app_capabilities.js b/remoting/webapp/base/js/app_capabilities.js index 655e913..bdbc96c 100644 --- a/remoting/webapp/base/js/app_capabilities.js +++ b/remoting/webapp/base/js/app_capabilities.js @@ -11,7 +11,7 @@ var remoting = remoting || {}; * Note that this needs to be a function because it gets expanded at * compile-time into remoting.ClientSession.Capability enums and these * are not guaranteed to be present yet when this file is loaded. - * @return {Array.<remoting.ClientSession.Capability>} + * @return {Array<remoting.ClientSession.Capability>} */ remoting.app_capabilities = function() { return ['APPLICATION_CAPABILITIES']; diff --git a/remoting/webapp/base/js/application.js b/remoting/webapp/base/js/application.js index 1b77fb0..e31fb50 100644 --- a/remoting/webapp/base/js/application.js +++ b/remoting/webapp/base/js/application.js @@ -13,7 +13,7 @@ var remoting = remoting || {}; /** - * @param {Array.<string>} app_capabilities Array of application capabilities. + * @param {Array<string>} app_capabilities Array of application capabilities. * @constructor */ remoting.Application = function(app_capabilities) { @@ -24,7 +24,7 @@ remoting.Application = function(app_capabilities) { this.delegate_ = null; /** - * @type {Array.<string>} + * @type {Array<string>} * @private */ this.app_capabilities_ = [ @@ -58,7 +58,7 @@ remoting.Application.prototype.getApplicationName = function() { }; /** - * @return {Array.<string>} A list of |ClientSession.Capability|s required + * @return {Array<string>} A list of |ClientSession.Capability|s required * by this application. */ remoting.Application.prototype.getRequiredCapabilities_ = function() { diff --git a/remoting/webapp/base/js/auth_dialog.js b/remoting/webapp/base/js/auth_dialog.js index cdb62d0..bdb2b48 100644 --- a/remoting/webapp/base/js/auth_dialog.js +++ b/remoting/webapp/base/js/auth_dialog.js @@ -48,7 +48,7 @@ remoting.AuthDialog = function(rootElement) { }; /** - * @param {Array.<{left: number, top: number, width: number, height: number}>} + * @param {Array<{left: number, top: number, width: number, height: number}>} * rects List of rectangles. */ remoting.AuthDialog.prototype.addToRegion = function(rects) { diff --git a/remoting/webapp/base/js/base.js b/remoting/webapp/base/js/base.js index 494fc27..9f2d83d 100644 --- a/remoting/webapp/base/js/base.js +++ b/remoting/webapp/base/js/base.js @@ -68,7 +68,7 @@ base.Disposable.prototype.dispose = function() {}; */ base.Disposables = function(var_args) { /** - * @type {Array.<base.Disposable>} + * @type {Array<base.Disposable>} * @private */ this.disposables_ = Array.prototype.slice.call(arguments, 0); @@ -165,7 +165,7 @@ base.isAppsV2 = function() { * Joins the |url| with optional query parameters defined in |opt_params| * See unit test for usage. * @param {string} url - * @param {Object.<string>=} opt_params + * @param {Object<string>=} opt_params * @return {string} */ base.urlJoin = function(url, opt_params) { @@ -182,7 +182,7 @@ base.urlJoin = function(url, opt_params) { /** - * @return {Object.<string, string>} The URL parameters. + * @return {Object<string, string>} The URL parameters. */ base.getUrlParameters = function() { var result = {}; @@ -364,7 +364,7 @@ base.Promise.as = function(method, params, opt_context, opt_hasErrorHandler) { * @constructor */ base.EventEntry = function() { - /** @type {Array.<function():void>} */ + /** @type {Array<function():void>} */ this.listeners = []; }; @@ -394,7 +394,7 @@ base.EventSource.prototype.removeEventListener = function(type, fn) {}; * @implements {base.EventSource} */ base.EventSourceImpl = function() { - /** @type {Object.<string, base.EventEntry>} */ + /** @type {Object<string, base.EventEntry>} */ this.eventMap_; }; @@ -412,7 +412,7 @@ base.EventSourceImpl.isDefined = function(obj, type) { base.EventSourceImpl.prototype = { /** * Define |events| for this event source. - * @param {Array.<string>} events + * @param {Array<string>} events */ defineEvents: function(events) { base.debug.assert(!Boolean(this.eventMap_), diff --git a/remoting/webapp/base/js/ipc.js b/remoting/webapp/base/js/ipc.js index 122ea5f..a940a28 100644 --- a/remoting/webapp/base/js/ipc.js +++ b/remoting/webapp/base/js/ipc.js @@ -50,7 +50,7 @@ var base = base || {}; base.Ipc = function() { base.debug.assert(instance_ === null); /** - * @type {!Object.<Function>} + * @type {!Object<Function>} * @private */ this.handlers_ = {}; diff --git a/remoting/webapp/base/js/message_window_helper.js b/remoting/webapp/base/js/message_window_helper.js index 030244a..a4d564d 100644 --- a/remoting/webapp/base/js/message_window_helper.js +++ b/remoting/webapp/base/js/message_window_helper.js @@ -68,7 +68,7 @@ remoting.MessageWindow = function(options) { /** @type {number} */ this.timer_ = 0; - /** @type {Array.<function():void>} */ + /** @type {Array<function():void>} */ this.pendingWindowOperations_ = []; /** diff --git a/remoting/webapp/base/js/message_window_manager.js b/remoting/webapp/base/js/message_window_manager.js index 2cdeeca..f1f50dc 100644 --- a/remoting/webapp/base/js/message_window_manager.js +++ b/remoting/webapp/base/js/message_window_manager.js @@ -16,7 +16,7 @@ remoting.MessageWindowManager = {}; /** * Mapping from window id to corresponding MessageWindow. * - * @type {Object.<number, remoting.MessageWindow>} + * @type {Object<number, remoting.MessageWindow>} * @private */ remoting.MessageWindowManager.messageWindows_ = {}; @@ -58,7 +58,7 @@ remoting.MessageWindowManager.deleteMessageWindow = function(id) { * Close all of the registered MessageWindows */ remoting.MessageWindowManager.closeAllMessageWindows = function() { - /** @type {Array.<remoting.MessageWindow>} */ + /** @type {Array<remoting.MessageWindow>} */ var windows = []; // Make a list of the windows to close. // We don't delete the window directly in this loop because close() can diff --git a/remoting/webapp/base/js/window_shape.js b/remoting/webapp/base/js/window_shape.js index cbeea97..dc3ddd1 100644 --- a/remoting/webapp/base/js/window_shape.js +++ b/remoting/webapp/base/js/window_shape.js @@ -16,13 +16,13 @@ var remoting = remoting || {}; /** @constructor */ remoting.WindowShape = function() { /** - * @type {Array.<{left: number, top: number, width: number, height: number}>} + * @type {Array<{left: number, top: number, width: number, height: number}>} * @private */ this.desktopRects_ = []; /** - * @type {Array.<remoting.WindowShape.ClientUI>} + * @type {Array<remoting.WindowShape.ClientUI>} * @private */ this.clientUICallbacks_ = []; @@ -49,7 +49,7 @@ remoting.WindowShape.prototype.addCallback = function(callback) { /** * Set the region associated with the remote desktop windows. * - * @param {Array.<{left: number, top: number, width: number, height: number}>} + * @param {Array<{left: number, top: number, width: number, height: number}>} * rects */ remoting.WindowShape.prototype.setDesktopRects = function(rects) { @@ -93,7 +93,7 @@ remoting.WindowShape.ClientUI = function () { /** * Add the context menu's bounding rectangle to the specified region. * - * @param {Array.<{left: number, top: number, width: number, height: number}>} + * @param {Array<{left: number, top: number, width: number, height: number}>} * rects */ remoting.WindowShape.ClientUI.prototype.addToRegion = function(rects) {}; diff --git a/remoting/webapp/browser_test/mock_host_list_api.js b/remoting/webapp/browser_test/mock_host_list_api.js index 144c20f..c318cd5 100644 --- a/remoting/webapp/browser_test/mock_host_list_api.js +++ b/remoting/webapp/browser_test/mock_host_list_api.js @@ -17,7 +17,7 @@ var remoting = remoting || {}; * @implements {remoting.HostListApi} */ remoting.MockHostListApi = function() { - /** @type {Array.<remoting.Host>} */ + /** @type {Array<remoting.Host>} */ this.hosts = [ { 'hostName': 'Online host', @@ -41,7 +41,7 @@ remoting.MockHostListApi = function() { }; /** - * @param {function(Array.<remoting.Host>):void} onDone + * @param {function(Array<remoting.Host>):void} onDone * @param {function(remoting.Error):void} onError */ remoting.MockHostListApi.prototype.get = function(onDone, onError) { diff --git a/remoting/webapp/browser_test/mock_identity.js b/remoting/webapp/browser_test/mock_identity.js index 19f9a2b..669e89f 100644 --- a/remoting/webapp/browser_test/mock_identity.js +++ b/remoting/webapp/browser_test/mock_identity.js @@ -69,7 +69,7 @@ remoting.MockIdentity.prototype.setAccessToken = function(accessToken) { * @param {string} token * @param {function()} onDone * @param {function()} onError - * @param {Array.<*>} values + * @param {Array<*>} values */ remoting.MockIdentity.validateTokenAndCall = function(token, onDone, onError, values) { @@ -87,7 +87,7 @@ remoting.MockIdentity.validateTokenAndCall = /** * @param {function()} onDone * @param {function()} onError - * @param {Array.<*>} values + * @param {Array<*>} values */ remoting.MockIdentity.prototype.validateTokenAndCall = function(onDone, onError, values) { diff --git a/remoting/webapp/crd/js/cast_extension_handler.js b/remoting/webapp/crd/js/cast_extension_handler.js index d3a0924..efd8efc 100644 --- a/remoting/webapp/crd/js/cast_extension_handler.js +++ b/remoting/webapp/crd/js/cast_extension_handler.js @@ -38,7 +38,7 @@ remoting.CastExtensionHandler = function(clientSession) { /** @type {string} @private */ this.kApplicationId_ = "8A1211E3"; - /** @type {Array.<Object>} @private */ + /** @type {Array<Object>} @private */ this.messageQueue_ = []; this.start_(); diff --git a/remoting/webapp/crd/js/client_plugin.js b/remoting/webapp/crd/js/client_plugin.js index 12f5a6d..5f21c1c 100644 --- a/remoting/webapp/crd/js/client_plugin.js +++ b/remoting/webapp/crd/js/client_plugin.js @@ -223,14 +223,14 @@ remoting.ClientPlugin.prototype.setDesktopSizeUpdateHandler = function(handler) {}; /** - * @param {function(Array.<Array.<number>>):void} handler Callback for desktop + * @param {function(Array<Array<number>>):void} handler Callback for desktop * shape change notifications. */ remoting.ClientPlugin.prototype.setDesktopShapeUpdateHandler = function(handler) {}; /** - * @param {function(!Array.<string>):void} handler Callback to inform of + * @param {function(!Array<string>):void} handler Callback to inform of * capabilities negotiated between host and client. */ remoting.ClientPlugin.prototype.setCapabilitiesHandler = @@ -309,7 +309,7 @@ remoting.ClientPluginFactory = function() {}; * @param {function(string, string):boolean} onExtensionMessage The handler for * protocol extension messages. Returns true if a message is recognized; * false otherwise. - * @param {Array.<string>} requiredCapabilities + * @param {Array<string>} requiredCapabilities * @return {remoting.ClientPlugin} A new client plugin instance. */ remoting.ClientPluginFactory.prototype.createPlugin = diff --git a/remoting/webapp/crd/js/client_plugin_impl.js b/remoting/webapp/crd/js/client_plugin_impl.js index af0fc72..6327770 100644 --- a/remoting/webapp/crd/js/client_plugin_impl.js +++ b/remoting/webapp/crd/js/client_plugin_impl.js @@ -21,7 +21,7 @@ remoting.ClientPluginMessage = function() { /** @type {string} */ this.method = ''; - /** @type {Object.<string,*>} */ + /** @type {Object<string,*>} */ this.data = {}; }; @@ -30,7 +30,7 @@ remoting.ClientPluginMessage = function() { * @param {function(string, string):boolean} onExtensionMessage The handler for * protocol extension messages. Returns true if a message is recognized; * false otherwise. - * @param {Array.<string>} requiredCapabilities The set of capabilties that the + * @param {Array<string>} requiredCapabilities The set of capabilties that the * session must support for this application. * @constructor * @implements {remoting.ClientPlugin} @@ -43,7 +43,7 @@ remoting.ClientPluginImpl = function(container, onExtensionMessage, this.onExtensionMessage_ = onExtensionMessage; /** - * @type {Array.<string>} + * @type {Array<string>} * @private */ this.requiredCapabilities_ = requiredCapabilities; @@ -98,12 +98,12 @@ remoting.ClientPluginImpl = function(container, onExtensionMessage, /** @private */ this.onDesktopSizeUpdateHandler_ = function () {}; /** - * @param {Array.<Array.<number>>} rects + * @param {Array<Array<number>>} rects * @private */ this.onDesktopShapeUpdateHandler_ = function (rects) {}; /** - * @param {!Array.<string>} capabilities The negotiated capabilities. + * @param {!Array<string>} capabilities The negotiated capabilities. * @private */ this.onSetCapabilitiesHandler_ = function (capabilities) {}; @@ -134,7 +134,7 @@ remoting.ClientPluginImpl = function(container, onExtensionMessage, */ this.pluginApiVersion_ = -1; /** - * @type {Array.<string>} + * @type {Array<string>} * @private */ this.pluginApiFeatures_ = []; @@ -144,7 +144,7 @@ remoting.ClientPluginImpl = function(container, onExtensionMessage, */ this.pluginApiMinVersion_ = -1; /** - * @type {!Array.<string>} + * @type {!Array<string>} * @private */ this.capabilities_ = []; @@ -273,7 +273,7 @@ remoting.ClientPluginImpl.prototype.setDesktopSizeUpdateHandler = }; /** - * @param {function(Array.<Array.<number>>):void} handler + * @param {function(Array<Array<number>>):void} handler */ remoting.ClientPluginImpl.prototype.setDesktopShapeUpdateHandler = function(handler) { @@ -281,7 +281,7 @@ remoting.ClientPluginImpl.prototype.setDesktopShapeUpdateHandler = }; /** - * @param {function(!Array.<string>):void} handler + * @param {function(!Array<string>):void} handler */ remoting.ClientPluginImpl.prototype.setCapabilitiesHandler = function(handler) { this.onSetCapabilitiesHandler_ = handler; @@ -355,10 +355,10 @@ remoting.ClientPluginImpl.prototype.handleMessageMethod_ = function(message) { /** * Splits a string into a list of words delimited by spaces. * @param {string} str String that should be split. - * @return {!Array.<string>} List of words. + * @return {!Array<string>} List of words. */ var tokenize = function(str) { - /** @type {Array.<string>} */ + /** @type {Array<string>} */ var tokens = str.match(/\S+/g); return tokens ? tokens : []; }; @@ -375,14 +375,14 @@ remoting.ClientPluginImpl.prototype.handleMessageMethod_ = function(message) { // Negotiate capabilities. - /** @type {!Array.<string>} */ + /** @type {!Array<string>} */ var requestedCapabilities = []; if ('requestedCapabilities' in message.data) { requestedCapabilities = tokenize(getStringAttr(message.data, 'requestedCapabilities')); } - /** @type {!Array.<string>} */ + /** @type {!Array<string>} */ var supportedCapabilities = []; if ('supportedCapabilities' in message.data) { supportedCapabilities = @@ -434,7 +434,7 @@ remoting.ClientPluginImpl.prototype.handleMessageMethod_ = function(message) { } else if (message.method == 'onDesktopShape') { var rects = getArrayAttr(message.data, 'rects'); for (var i = 0; i < rects.length; ++i) { - /** @type {Array.<number>} */ + /** @type {Array<number>} */ var rect = rects[i]; if (typeof rect != 'object' || rect.length != 4) { throw 'Received invalid onDesktopShape message'; @@ -480,7 +480,7 @@ remoting.ClientPluginImpl.prototype.handleMessageMethod_ = function(message) { this.fetchPinHandler_(pairingSupported); } else if (message.method == 'setCapabilities') { - /** @type {!Array.<string>} */ + /** @type {!Array<string>} */ var capabilities = tokenize(getStringAttr(message.data, 'capabilities')); this.onSetCapabilitiesHandler_(capabilities); @@ -966,7 +966,7 @@ remoting.DefaultClientPluginFactory = function() {}; /** * @param {Element} container * @param {function(string, string):boolean} onExtensionMessage - * @param {Array.<string>} requiredCapabilities + * @param {Array<string>} requiredCapabilities * @return {remoting.ClientPlugin} */ remoting.DefaultClientPluginFactory.prototype.createPlugin = diff --git a/remoting/webapp/crd/js/client_session.js b/remoting/webapp/crd/js/client_session.js index c5d95c9..2459ba3 100644 --- a/remoting/webapp/crd/js/client_session.js +++ b/remoting/webapp/crd/js/client_session.js @@ -261,7 +261,7 @@ remoting.ClientSession.Capability = { /** * The set of capabilities negotiated between the client and host. - * @type {Array.<string>} + * @type {Array<string>} * @private */ remoting.ClientSession.prototype.capabilities_ = null; @@ -285,7 +285,7 @@ remoting.ClientSession.prototype.hasCapability = function(capability) { * @param {function(string, string):boolean} onExtensionMessage The handler for * protocol extension messages. Returns true if a message is recognized; * false otherwise. - * @param {Array.<string>} requiredCapabilities A list of capabilities + * @param {Array<string>} requiredCapabilities A list of capabilities * required by this application. */ remoting.ClientSession.prototype.createPluginAndConnect = @@ -604,7 +604,7 @@ remoting.ClientSession.prototype.onConnectionReady_ = function(ready) { /** * Called when the client-host capabilities negotiation is complete. * - * @param {!Array.<string>} capabilities The set of capabilities negotiated + * @param {!Array<string>} capabilities The set of capabilities negotiated * between the client and host. * @return {void} Nothing. * @private diff --git a/remoting/webapp/crd/js/connection_stats.js b/remoting/webapp/crd/js/connection_stats.js index 3da3993..65e3a97 100644 --- a/remoting/webapp/crd/js/connection_stats.js +++ b/remoting/webapp/crd/js/connection_stats.js @@ -58,7 +58,7 @@ remoting.ConnectionStats.prototype.show = function(show) { /** * If the stats panel is visible, add its bounding rectangle to the specified * region. - * @param {Array.<{left: number, top: number, width: number, height: number}>} + * @param {Array<{left: number, top: number, width: number, height: number}>} * rects List of rectangles. */ diff --git a/remoting/webapp/crd/js/crd_event_handlers.js b/remoting/webapp/crd/js/crd_event_handlers.js index 9196e6b..4d21a5a 100644 --- a/remoting/webapp/crd/js/crd_event_handlers.js +++ b/remoting/webapp/crd/js/crd_event_handlers.js @@ -47,7 +47,7 @@ remoting.initElementEventHandlers = function() { remoting.setMode(remoting.AppMode.HOME); document.getElementById('access-code-entry').value = ''; }; - /** @type {Array.<{event: string, id: string, fn: function(Event):void}>} */ + /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */ var it2me_actions = [ { event: 'click', id: 'access-mode-button', fn: goEnterAccessCode }, { event: 'submit', id: 'access-code-form', fn: sendAccessCode }, @@ -59,7 +59,7 @@ remoting.initElementEventHandlers = function() { { event: 'click', id: 'host-finished-button', fn: goHome }, { event: 'click', id: 'share-button', fn: remoting.tryShare } ]; - /** @type {Array.<{event: string, id: string, fn: function(Event):void}>} */ + /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */ var me2me_actions = [ { event: 'click', id: 'change-daemon-pin', fn: function() { remoting.hostSetupDialog.showForPin(); } }, @@ -72,7 +72,7 @@ remoting.initElementEventHandlers = function() { fn: function() { remoting.hostSetupDialog.showForStart(); } }, { event: 'click', id: 'stop-daemon', fn: stopDaemon } ]; - /** @type {Array.<{event: string, id: string, fn: function(Event):void}>} */ + /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */ var host_actions = [ { event: 'click', id: 'close-paired-client-manager-dialog', fn: goHome }, { event: 'click', id: 'host-config-done-dismiss', fn: goHome }, @@ -82,7 +82,7 @@ remoting.initElementEventHandlers = function() { remoting.AppMode.HOME_MANAGE_PAIRINGS) }, { event: 'click', id: 'stop-sharing-button', fn: remoting.cancelShare } ]; - /** @type {Array.<{event: string, id: string, fn: function(Event):void}>} */ + /** @type {Array<{event: string, id: string, fn: function(Event):void}>} */ var auth_actions = [ { event: 'click', id: 'cancel-connect-button', fn: goHome }, { event: 'click', id: 'sign-out', fn:remoting.signOut }, diff --git a/remoting/webapp/crd/js/desktop_connected_view.js b/remoting/webapp/crd/js/desktop_connected_view.js index 500a69a..140607e 100644 --- a/remoting/webapp/crd/js/desktop_connected_view.js +++ b/remoting/webapp/crd/js/desktop_connected_view.js @@ -205,7 +205,7 @@ remoting.DesktopConnectedView.prototype.notifyClientResolution_ = function() { * @param {function(string, string):boolean} onExtensionMessage The handler for * protocol extension messages. Returns true if a message is recognized; * false otherwise. - * @param {Array.<string>} requiredCapabilities A list of capabilities + * @param {Array<string>} requiredCapabilities A list of capabilities * required by this application. */ remoting.DesktopConnectedView.prototype.createPluginAndConnect = @@ -218,7 +218,7 @@ remoting.DesktopConnectedView.prototype.createPluginAndConnect = }; /** - * @param {Object.<string|boolean|number>} options The current options for the + * @param {Object<string|boolean|number>} options The current options for the * host, or {} if this client has no saved settings for the host. * @private */ @@ -323,7 +323,7 @@ remoting.DesktopConnectedView.prototype.onDesktopSizeChanged_ = function() { * Sets the non-click-through area of the client in response to notifications * from the plugin of desktop shape changes. * - * @param {Array.<Array.<number>>} rects List of rectangles comprising the + * @param {Array<Array<number>>} rects List of rectangles comprising the * desktop shape. * @return {void} Nothing. * @private @@ -993,7 +993,7 @@ remoting.DesktopConnectedView.prototype.applyRemapKeys_ = function(apply) { * Sends a key combination to the remoting client, by sending down events for * the given keys, followed by up events in reverse order. * - * @param {Array.<number>} keys Key codes to be sent. + * @param {Array<number>} keys Key codes to be sent. * @return {void} Nothing. * @private */ diff --git a/remoting/webapp/crd/js/event_handlers.js b/remoting/webapp/crd/js/event_handlers.js index 9e1c68d..4332709 100644 --- a/remoting/webapp/crd/js/event_handlers.js +++ b/remoting/webapp/crd/js/event_handlers.js @@ -5,7 +5,7 @@ 'use strict'; /** - * @param {Array.<{event: string, id: string, + * @param {Array<{event: string, id: string, * fn: function(Event):void}>} actions Array of actions to register. */ function registerEventListeners(actions) { diff --git a/remoting/webapp/crd/js/fallback_signal_strategy.js b/remoting/webapp/crd/js/fallback_signal_strategy.js index 88f15c4..030bfb4 100644 --- a/remoting/webapp/crd/js/fallback_signal_strategy.js +++ b/remoting/webapp/crd/js/fallback_signal_strategy.js @@ -111,7 +111,7 @@ remoting.FallbackSignalStrategy = function(primary, this.logToServer_ = null; /** - * @type {Array.<{strategyType: remoting.SignalStrategy.Type, + * @type {Array<{strategyType: remoting.SignalStrategy.Type, progress: remoting.FallbackSignalStrategy.Progress, * elapsed: number}>} */ diff --git a/remoting/webapp/crd/js/host.js b/remoting/webapp/crd/js/host.js index be45874..15014c7 100644 --- a/remoting/webapp/crd/js/host.js +++ b/remoting/webapp/crd/js/host.js @@ -30,7 +30,7 @@ remoting.Host = function() { this.publicKey = ''; /** @type {string} */ this.hostVersion = ''; - /** @type {Array.<string>} */ + /** @type {Array<string>} */ this.tokenUrlPatterns = []; /** @type {string} */ this.updatedTime = ''; diff --git a/remoting/webapp/crd/js/host_controller.js b/remoting/webapp/crd/js/host_controller.js index 3dd8c93..e4c7a78 100644 --- a/remoting/webapp/crd/js/host_controller.js +++ b/remoting/webapp/crd/js/host_controller.js @@ -130,7 +130,7 @@ remoting.HostController.prototype.start = function(hostPin, consent, onDone, function generateUuid() { var random = new Uint16Array(8); window.crypto.getRandomValues(random); - /** @type {Array.<string>} */ + /** @type {Array<string>} */ var e = new Array(); for (var i = 0; i < 8; i++) { e[i] = (/** @type {number} */ (random[i]) + 0x10000). @@ -487,7 +487,7 @@ remoting.HostController.prototype.getLocalHostId = function(onDone) { /** * Fetch the list of paired clients for this host. * - * @param {function(Array.<remoting.PairedClient>):void} onDone + * @param {function(Array<remoting.PairedClient>):void} onDone * @param {function(remoting.Error):void} onError * @return {void} */ diff --git a/remoting/webapp/crd/js/host_daemon_facade.js b/remoting/webapp/crd/js/host_daemon_facade.js index de5e335..193a756 100644 --- a/remoting/webapp/crd/js/host_daemon_facade.js +++ b/remoting/webapp/crd/js/host_daemon_facade.js @@ -23,7 +23,7 @@ remoting.HostDaemonFacade = function() { this.nextId_ = 0; /** - * @type {Object.<number, remoting.HostDaemonFacade.PendingReply>} + * @type {Object<number, remoting.HostDaemonFacade.PendingReply>} * @private */ this.pendingReplies_ = {}; @@ -34,10 +34,10 @@ remoting.HostDaemonFacade = function() { /** @type {string} @private */ this.version_ = ''; - /** @type {Array.<remoting.HostController.Feature>} @private */ + /** @type {Array<remoting.HostController.Feature>} @private */ this.supportedFeatures_ = []; - /** @type {Array.<function(boolean):void>} @private */ + /** @type {Array<function(boolean):void>} @private */ this.afterInitializationTasks_ = []; /** @@ -504,7 +504,7 @@ remoting.HostDaemonFacade.prototype.getDaemonState = /** * Retrieves the list of paired clients. * - * @param {function(Array.<remoting.PairedClient>):void} onDone Callback to + * @param {function(Array<remoting.PairedClient>):void} onDone Callback to * return result. * @param {function(remoting.Error):void} onError Callback to call on error. */ diff --git a/remoting/webapp/crd/js/host_installer.js b/remoting/webapp/crd/js/host_installer.js index 6f1f310..9324a0f 100644 --- a/remoting/webapp/crd/js/host_installer.js +++ b/remoting/webapp/crd/js/host_installer.js @@ -80,7 +80,7 @@ remoting.HostInstaller.isInstalled = function() { }); }; -/** @type {Object.<string,string>} */ +/** @type {Object<string,string>} */ var HOST_DOWNLOAD_URLS = { 'Win32': 'http://dl.google.com/dl/edgedl/chrome-remote-desktop/' + 'chromeremotedesktophost.msi', diff --git a/remoting/webapp/crd/js/host_list.js b/remoting/webapp/crd/js/host_list.js index fd39e96..4221115 100644 --- a/remoting/webapp/crd/js/host_list.js +++ b/remoting/webapp/crd/js/host_list.js @@ -57,12 +57,12 @@ remoting.HostList = function(table, noHosts, errorMsg, errorButton, */ this.loadingIndicator_ = loadingIndicator; /** - * @type {Array.<remoting.HostTableEntry>} + * @type {Array<remoting.HostTableEntry>} * @private */ this.hostTableEntries_ = []; /** - * @type {Array.<remoting.Host>} + * @type {Array<remoting.Host>} * @private */ this.hosts_ = []; @@ -111,12 +111,12 @@ remoting.HostList.prototype.load = function(onDone) { // Load the cache of the last host-list, if present. /** @type {remoting.HostList} */ var that = this; - /** @param {Object.<string>} items */ + /** @param {Object<string>} items */ var storeHostList = function(items) { if (items[remoting.HostList.HOSTS_KEY]) { var cached = base.jsonParseSafe(items[remoting.HostList.HOSTS_KEY]); if (cached) { - that.hosts_ = /** @type {Array.<remoting.Host>} */ (cached); + that.hosts_ = /** @type {Array<remoting.Host>} */ (cached); } else { console.error('Invalid value for ' + remoting.HostList.HOSTS_KEY); } @@ -182,7 +182,7 @@ remoting.HostList.prototype.refresh = function(onDone) { * able to successfully parse it. * * @param {function(boolean):void} onDone The callback passed to |refresh|. - * @param {Array.<remoting.Host>} hosts The list of hosts for the user. + * @param {Array<remoting.Host>} hosts The list of hosts for the user. * @return {void} Nothing. * @private */ diff --git a/remoting/webapp/crd/js/host_list_api.js b/remoting/webapp/crd/js/host_list_api.js index b172376..04b2cdd 100644 --- a/remoting/webapp/crd/js/host_list_api.js +++ b/remoting/webapp/crd/js/host_list_api.js @@ -19,7 +19,7 @@ remoting.HostListApi = function() { /** * Fetch the list of hosts for a user. * - * @param {function(Array.<remoting.Host>):void} onDone + * @param {function(Array<remoting.Host>):void} onDone * @param {function(remoting.Error):void} onError */ remoting.HostListApi.prototype.get = function(onDone, onError) { diff --git a/remoting/webapp/crd/js/host_list_api_impl.js b/remoting/webapp/crd/js/host_list_api_impl.js index 9516e3c..5cf4a2d 100644 --- a/remoting/webapp/crd/js/host_list_api_impl.js +++ b/remoting/webapp/crd/js/host_list_api_impl.js @@ -22,7 +22,7 @@ remoting.HostListApiImpl = function() { /** * Fetch the list of hosts for a user. * - * @param {function(Array.<remoting.Host>):void} onDone + * @param {function(Array<remoting.Host>):void} onDone * @param {function(remoting.Error):void} onError */ remoting.HostListApiImpl.prototype.get = function(onDone, onError) { @@ -95,7 +95,7 @@ remoting.HostListApiImpl.prototype.remove = function(hostId, onDone, onError) { * include a JSON-encoded list of host descriptions, which is parsed and * passed to the callback. * - * @param {function(Array.<remoting.Host>):void} onDone + * @param {function(Array<remoting.Host>):void} onDone * @param {function(remoting.Error):void} onError * @param {XMLHttpRequest} xhr * @private diff --git a/remoting/webapp/crd/js/host_settings.js b/remoting/webapp/crd/js/host_settings.js index e6164f1..9257f19 100644 --- a/remoting/webapp/crd/js/host_settings.js +++ b/remoting/webapp/crd/js/host_settings.js @@ -75,7 +75,7 @@ remoting.HostSettings.save = function(hostId, options, opt_callback) { */ remoting.HostSettings.loadInternal_ = function(hostId, callback) { /** - * @param {Object.<string>} allHosts The current options for all hosts. + * @param {Object<string>} allHosts The current options for all hosts. * @return {void} Nothing. */ var onDone = function(allHosts) { diff --git a/remoting/webapp/crd/js/host_setup_dialog.js b/remoting/webapp/crd/js/host_setup_dialog.js index 8fb02de..fc258d8 100644 --- a/remoting/webapp/crd/js/host_setup_dialog.js +++ b/remoting/webapp/crd/js/host_setup_dialog.js @@ -8,7 +8,7 @@ var remoting = remoting || {}; /** - * @param {Array.<remoting.HostSetupFlow.State>} sequence Sequence of + * @param {Array<remoting.HostSetupFlow.State>} sequence Sequence of * steps for the flow. * @constructor */ @@ -273,7 +273,7 @@ remoting.HostSetupDialog.prototype.hide = function() { /** * Starts new flow with the specified sequence of steps. - * @param {Array.<remoting.HostSetupFlow.State>} sequence Sequence of steps. + * @param {Array<remoting.HostSetupFlow.State>} sequence Sequence of steps. * @private */ remoting.HostSetupDialog.prototype.startNewFlow_ = function(sequence) { diff --git a/remoting/webapp/crd/js/identity.js b/remoting/webapp/crd/js/identity.js index 161e083..96afd69 100644 --- a/remoting/webapp/crd/js/identity.js +++ b/remoting/webapp/crd/js/identity.js @@ -31,7 +31,7 @@ remoting.Identity = function(opt_consentDialog) { this.email_ = ''; /** @type {string} @private */ this.fullName_ = ''; - /** @type {Array.<remoting.Identity.Callbacks>} */ + /** @type {Array<remoting.Identity.Callbacks>} */ this.pendingCallbacks_ = []; }; diff --git a/remoting/webapp/crd/js/it2me_helpee_channel.js b/remoting/webapp/crd/js/it2me_helpee_channel.js index 65614f4..3ab8762 100644 --- a/remoting/webapp/crd/js/it2me_helpee_channel.js +++ b/remoting/webapp/crd/js/it2me_helpee_channel.js @@ -161,7 +161,7 @@ remoting.It2MeHelpeeChannel.prototype.dispose = function() { /** * Message Handler for incoming runtime messages from Hangouts. * - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelpeeChannel.prototype.onHangoutMessage_ = function(message) { @@ -197,7 +197,7 @@ remoting.It2MeHelpeeChannel.prototype.onHangoutMessage_ = function(message) { /** * Queries the |hostInstaller| for the installation status. * - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelpeeChannel.prototype.handleIsHostInstalled_ = @@ -221,7 +221,7 @@ remoting.It2MeHelpeeChannel.prototype.handleIsHostInstalled_ = }; /** - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelpeeChannel.prototype.handleDownloadHost_ = function(message) { @@ -244,7 +244,7 @@ remoting.It2MeHelpeeChannel.prototype.onHangoutDisconnect_ = function() { /** * Connects to the It2Me Native messaging Host and retrieves the access code. * - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelpeeChannel.prototype.handleConnect_ = @@ -473,7 +473,7 @@ remoting.It2MeHelpeeChannel.prototype.onHostStateChanged_ = function(state) { }; /** - * @param {?{method:string, data:Object.<string,*>}} incomingMessage + * @param {?{method:string, data:Object<string,*>}} incomingMessage * @param {string|Error} error * @private */ diff --git a/remoting/webapp/crd/js/it2me_helper_channel.js b/remoting/webapp/crd/js/it2me_helper_channel.js index a05ad60..5411ea3 100644 --- a/remoting/webapp/crd/js/it2me_helper_channel.js +++ b/remoting/webapp/crd/js/it2me_helper_channel.js @@ -144,7 +144,7 @@ remoting.It2MeHelperChannel.prototype.instanceId = function() { }; /** - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @return {boolean} whether the message is handled or not. * @private */ @@ -176,7 +176,7 @@ remoting.It2MeHelperChannel.prototype.onHangoutMessage_ = function(message) { /** * Disconnect the existing connection to the helpee. * - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelperChannel.prototype.closeWebapp_ = @@ -194,7 +194,7 @@ remoting.It2MeHelperChannel.prototype.closeWebapp_ = /** * Launches the web app. * - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelperChannel.prototype.launchWebapp_ = @@ -259,7 +259,7 @@ remoting.It2MeHelperChannel.prototype.onWebappDisconnect_ = function(port) { }; /** - * @param {{method:string, data:Object.<string,*>}} message + * @param {{method:string, data:Object<string,*>}} message * @private */ remoting.It2MeHelperChannel.prototype.onWebappMessage_ = function(message) { @@ -307,7 +307,7 @@ remoting.It2MeHelperChannel.prototype.unhookPorts_ = function() { /** * @param {chrome.runtime.Port} port * @param {string|Error} error - * @param {?{method:string, data:Object.<string,*>}=} opt_incomingMessage + * @param {?{method:string, data:Object<string,*>}=} opt_incomingMessage * @private */ remoting.It2MeHelperChannel.prototype.sendErrorResponse_ = diff --git a/remoting/webapp/crd/js/it2me_service.js b/remoting/webapp/crd/js/it2me_service.js index d705f5b..8135e33 100644 --- a/remoting/webapp/crd/js/it2me_service.js +++ b/remoting/webapp/crd/js/it2me_service.js @@ -28,7 +28,7 @@ remoting.It2MeService = function(appLauncher) { this.appLauncher_ = appLauncher; /** - * @type {Array.<remoting.It2MeHelperChannel>} + * @type {Array<remoting.It2MeHelperChannel>} * @private */ this.helpers_ = []; diff --git a/remoting/webapp/crd/js/log_to_server.js b/remoting/webapp/crd/js/log_to_server.js index 011f969..8b87f1b 100644 --- a/remoting/webapp/crd/js/log_to_server.js +++ b/remoting/webapp/crd/js/log_to_server.js @@ -160,7 +160,7 @@ remoting.LogToServer.shouldAddDuration_ = function(state) { /** * Logs connection statistics. - * @param {Object.<string, number>} stats The connection statistics + * @param {Object<string, number>} stats The connection statistics */ remoting.LogToServer.prototype.logStatistics = function(stats) { this.maybeExpireSessionId_(); diff --git a/remoting/webapp/crd/js/oauth2.js b/remoting/webapp/crd/js/oauth2.js index 7a18a9c..b4fbaf1 100644 --- a/remoting/webapp/crd/js/oauth2.js +++ b/remoting/webapp/crd/js/oauth2.js @@ -263,7 +263,7 @@ remoting.OAuth2.prototype.getAuthorizationCode = function(onDone) { /** * Processes the results of the oauth flow. * - * @param {Object.<string, string>} message Dictionary containing the parsed + * @param {Object<string, string>} message Dictionary containing the parsed * OAuth redirect URL parameters. * @param {function(*)} sendResponse Function to send response. */ diff --git a/remoting/webapp/crd/js/paired_client_manager.js b/remoting/webapp/crd/js/paired_client_manager.js index d001cf3..2dd851c 100644 --- a/remoting/webapp/crd/js/paired_client_manager.js +++ b/remoting/webapp/crd/js/paired_client_manager.js @@ -91,7 +91,7 @@ remoting.PairedClient.prototype.isValid = function() { * the input object is incorrectly formatted. * * @param {*} pairedClients The object to convert. - * @return {Array.<remoting.PairedClient>} The converted result. + * @return {Array<remoting.PairedClient>} The converted result. */ remoting.PairedClient.convertToPairedClientArray = function(pairedClients) { if (!(pairedClients instanceof Array)) { @@ -168,7 +168,7 @@ remoting.PairedClientManager = function(hostController, listContainer, message, */ this.clientRows_ = listContainer.querySelector('tbody'); /** - * @type {Array.<remoting.PairedClient>} + * @type {Array<remoting.PairedClient>} */ this.pairedClients_ = []; diff --git a/remoting/webapp/crd/js/server_log_entry.js b/remoting/webapp/crd/js/server_log_entry.js index e660945..7d848aa 100644 --- a/remoting/webapp/crd/js/server_log_entry.js +++ b/remoting/webapp/crd/js/server_log_entry.js @@ -21,7 +21,7 @@ var remoting = remoting || {}; * @constructor */ remoting.ServerLogEntry = function() { - /** @type Object.<string, string> */ this.dict = {}; + /** @type Object<string, string> */ this.dict = {}; }; /** @private */ @@ -209,7 +209,7 @@ remoting.ServerLogEntry.prototype.toStanza = function() { * @param {number} indentLevel the indentation level */ remoting.ServerLogEntry.prototype.toDebugLog = function(indentLevel) { - /** @type Array.<string> */ var fields = []; + /** @type Array<string> */ var fields = []; for (var key in this.dict) { fields.push(key + ': ' + this.dict[key]); } diff --git a/remoting/webapp/crd/js/session_connector.js b/remoting/webapp/crd/js/session_connector.js index 2e13fc8..f0d4f88 100644 --- a/remoting/webapp/crd/js/session_connector.js +++ b/remoting/webapp/crd/js/session_connector.js @@ -124,7 +124,7 @@ remoting.SessionConnectorFactory = function() {}; * false otherwise. * @param {function(remoting.Error):void} onConnectionFailed Callback for when * the connection fails. - * @param {Array.<string>} requiredCapabilities Connector capabilities + * @param {Array<string>} requiredCapabilities Connector capabilities * required by this application. * @param {string} defaultRemapKeys The default set of key mappings to use * in the client session. diff --git a/remoting/webapp/crd/js/session_connector_impl.js b/remoting/webapp/crd/js/session_connector_impl.js index e215b1c..dfe3125 100644 --- a/remoting/webapp/crd/js/session_connector_impl.js +++ b/remoting/webapp/crd/js/session_connector_impl.js @@ -22,7 +22,7 @@ var remoting = remoting || {}; * false otherwise. * @param {function(remoting.Error):void} onConnectionFailed Callback for when * the connection fails. - * @param {Array.<string>} requiredCapabilities Connector capabilities + * @param {Array<string>} requiredCapabilities Connector capabilities * required by this application. * @param {string} defaultRemapKeys The default set of key mappings for the * client session to use. @@ -65,7 +65,7 @@ remoting.SessionConnectorImpl = function(clientContainer, onConnected, onError, this.onConnectionFailed_ = onConnectionFailed; /** - * @type {Array.<string>} + * @type {Array<string>} * @private */ this.requiredCapabilities_ = requiredCapabilities; @@ -647,7 +647,7 @@ remoting.DefaultSessionConnectorFactory = function() { * false otherwise. * @param {function(remoting.Error):void} onConnectionFailed Callback for when * the connection fails. - * @param {Array.<string>} requiredCapabilities Connector capabilities + * @param {Array<string>} requiredCapabilities Connector capabilities * required by this application. * @param {string} defaultRemapKeys The default set of key mappings to use * in the client session. diff --git a/remoting/webapp/crd/js/stats_accumulator.js b/remoting/webapp/crd/js/stats_accumulator.js index adf89c5..4cfe8e3 100644 --- a/remoting/webapp/crd/js/stats_accumulator.js +++ b/remoting/webapp/crd/js/stats_accumulator.js @@ -23,7 +23,7 @@ remoting.StatsAccumulator = function() { /** * A map from names to lists of values. * @private - * @type Object.<string, Array.<number>> + * @type Object<string, Array<number>> */ this.valueLists_ = {}; @@ -39,7 +39,7 @@ remoting.StatsAccumulator = function() { /** * Adds values to this object. * - * @param {Object.<string, number>} newValues + * @param {Object<string, number>} newValues */ remoting.StatsAccumulator.prototype.add = function(newValues) { for (var key in newValues) { @@ -79,7 +79,7 @@ remoting.StatsAccumulator.prototype.getTimeSinceFirstValue = function() { */ remoting.StatsAccumulator.prototype.calcMean = function(key) { /** - * @param {Array.<number>} values + * @param {Array<number>} values * @return {number} */ var calcMean = function(values) { @@ -99,7 +99,7 @@ remoting.StatsAccumulator.prototype.calcMean = function(key) { * Applies a given map to the list of values for a given key. * * @param {string} key - * @param {function(Array.<number>): number} map + * @param {function(Array<number>): number} map * @return {number} the result of applying that map to the list of values for * that key */ @@ -114,7 +114,7 @@ remoting.StatsAccumulator.prototype.map = function(key, map) { * * @private * @param {string} key - * @return {Array.<number>} the list of values for that key + * @return {Array<number>} the list of values for that key */ remoting.StatsAccumulator.prototype.getValueList = function(key) { var valueList = this.valueLists_[key]; diff --git a/remoting/webapp/crd/js/third_party_token_fetcher.js b/remoting/webapp/crd/js/third_party_token_fetcher.js index ba98132..f9168c4 100644 --- a/remoting/webapp/crd/js/third_party_token_fetcher.js +++ b/remoting/webapp/crd/js/third_party_token_fetcher.js @@ -30,7 +30,7 @@ var remoting = remoting || {}; * @param {string} tokenUrl Token-issue URL received from the host. * @param {string} hostPublicKey Host public key (DER and Base64 encoded). * @param {string} scope OAuth scope to request the token for. - * @param {Array.<string>} tokenUrlPatterns Token URL patterns allowed for the + * @param {Array<string>} tokenUrlPatterns Token URL patterns allowed for the * domain, received from the directory server. * @param {function(string, string):void} onThirdPartyTokenFetched Callback. */ @@ -97,7 +97,7 @@ remoting.ThirdPartyTokenFetcher.prototype.parseRedirectUrl_ = if (responseUrl && responseUrl.search('#') >= 0) { var query = responseUrl.substring(responseUrl.search('#') + 1); var parts = query.split('&'); - /** @type {Object.<string>} */ + /** @type {Object<string>} */ var queryArgs = {}; for (var i = 0; i < parts.length; i++) { var pair = parts[i].split('='); diff --git a/remoting/webapp/crd/js/typecheck.js b/remoting/webapp/crd/js/typecheck.js index 7365238..b44df12 100644 --- a/remoting/webapp/crd/js/typecheck.js +++ b/remoting/webapp/crd/js/typecheck.js @@ -9,7 +9,7 @@ * If the attribute is not an array, then an exception will be thrown unless * a default value is specified in |opt_default|. * - * @param {Object.<string,*>} dict The dictionary containing the |key| + * @param {Object<string,*>} dict The dictionary containing the |key| * @param {string} key The key to typecheck in the |dict|. * @param {Array=} opt_default The value to return if the key is not a bool. * @return {Array} The |key| attribute value as an object. @@ -34,7 +34,7 @@ function getArrayAttr(dict, key, opt_default) { * If the attribute is not a boolean, then an exception will be thrown unless * a default value is specified in |opt_default|. * - * @param {Object.<string,*>} dict The dictionary containing the |key| + * @param {Object<string,*>} dict The dictionary containing the |key| * @param {string} key The key to typecheck in the |dict|. * @param {boolean=} opt_default The value to return if the key is not a bool. * @return {boolean} The |key| attribute value as a boolean. @@ -62,7 +62,7 @@ function getBooleanAttr(dict, key, opt_default) { * If the attribute is not a number, then an exception will be thrown unless * a default value is specified in |opt_default|. * - * @param {Object.<string,*>} dict The dictionary containing the |key| + * @param {Object<string,*>} dict The dictionary containing the |key| * @param {string} key The key to typecheck in the |dict|. * @param {number=} opt_default The value to return if the key is not a number. * @return {number} The |key| attribute value as a number. @@ -87,7 +87,7 @@ function getNumberAttr(dict, key, opt_default) { * If the attribute is not an object, then an exception will be thrown unless * a default value is specified in |opt_default|. * - * @param {Object.<string,*>} dict The dictionary containing the |key| + * @param {Object<string,*>} dict The dictionary containing the |key| * @param {string} key The key to typecheck in the |dict|. * @param {Object=} opt_default The value to return if the key is not a bool. * @return {Object} The |key| attribute value as an object. @@ -112,7 +112,7 @@ function getObjectAttr(dict, key, opt_default) { * If the attribute is not a string, then an exception will be thrown unless * a default value is specified in |opt_default|. * - * @param {Object.<string,*>} dict The dictionary containing the |key| + * @param {Object<string,*>} dict The dictionary containing the |key| * @param {string} key The key to typecheck in the |dict|. * @param {string=} opt_default The value to return if the key is not a string. * @return {string} The |key| attribute value as a string. diff --git a/remoting/webapp/crd/js/ui_mode.js b/remoting/webapp/crd/js/ui_mode.js index ea8d2af..89c833e 100644 --- a/remoting/webapp/crd/js/ui_mode.js +++ b/remoting/webapp/crd/js/ui_mode.js @@ -60,7 +60,7 @@ remoting.kMe2MeVisitedStorageKey = 'me2me-visited'; /** * @param {Element} element The element to check. * @param {string} attrName The attribute on the element to check. - * @param {Array.<string>} modes The modes to check for. + * @param {Array<string>} modes The modes to check for. * @return {boolean} True if any mode in |modes| is found within the attribute. */ remoting.hasModeAttribute = function(element, attrName, modes) { @@ -239,15 +239,15 @@ remoting.initModalDialogs = function() { }; /** - * @param {Array.<MutationRecord>} mutations The set of mutations affecting + * @param {Array<MutationRecord>} mutations The set of mutations affecting * an observed node. */ function confineOrRestoreFocus_(mutations) { // The list of mutations can include duplicates, so reduce it to a canonical // show/hide list. - /** @type {Array.<Node>} */ + /** @type {Array<Node>} */ var shown = []; - /** @type {Array.<Node>} */ + /** @type {Array<Node>} */ var hidden = []; for (var i = 0; i < mutations.length; ++i) { var mutation = mutations[i]; diff --git a/remoting/webapp/crd/js/video_frame_recorder.js b/remoting/webapp/crd/js/video_frame_recorder.js index daf4911..2515069 100644 --- a/remoting/webapp/crd/js/video_frame_recorder.js +++ b/remoting/webapp/crd/js/video_frame_recorder.js @@ -116,7 +116,7 @@ remoting.VideoFrameRecorder.prototype.handleMessage = /** * @param {Entry} entry The single file entry if multiple files are not allowed. - * @param {Array.<FileEntry>} fileEntries List of file entries if multiple files + * @param {Array<FileEntry>} fileEntries List of file entries if multiple files * are allowed. */ remoting.VideoFrameRecorder.prototype.onFileChosen_ = function( diff --git a/remoting/webapp/crd/js/wcs.js b/remoting/webapp/crd/js/wcs.js index 3a6d1e3..a019c1b 100644 --- a/remoting/webapp/crd/js/wcs.js +++ b/remoting/webapp/crd/js/wcs.js @@ -81,7 +81,7 @@ remoting.Wcs.prototype.updateAccessToken = function(tokenNew) { /** * Handles a message coming from the WcsIqClient. * - * @param {Array.<string>} msg The message. + * @param {Array<string>} msg The message. * @return {void} Nothing. * @private */ diff --git a/remoting/webapp/crd/js/wcs_sandbox_container.js b/remoting/webapp/crd/js/wcs_sandbox_container.js index 4104c36..0934df4 100644 --- a/remoting/webapp/crd/js/wcs_sandbox_container.js +++ b/remoting/webapp/crd/js/wcs_sandbox_container.js @@ -31,7 +31,7 @@ remoting.WcsSandboxContainer = function(sandbox) { /** @type {?function(string):void} * @private */ this.onIq_ = null; - /** @type {Object.<number, XMLHttpRequest>} + /** @type {Object<number, XMLHttpRequest>} * @private */ this.pendingXhrs_ = {}; /** @private */ diff --git a/remoting/webapp/crd/js/wcs_sandbox_content.js b/remoting/webapp/crd/js/wcs_sandbox_content.js index 213d87a..95c7700 100644 --- a/remoting/webapp/crd/js/wcs_sandbox_content.js +++ b/remoting/webapp/crd/js/wcs_sandbox_content.js @@ -27,7 +27,7 @@ remoting.WcsSandboxContent = function() { */ this.nextXhrId_ = 0; /** - * @type {Object.<number, XMLHttpRequest>} + * @type {Object<number, XMLHttpRequest>} * @private */ this.pendingXhrs_ = {}; diff --git a/remoting/webapp/crd/js/window_frame.js b/remoting/webapp/crd/js/window_frame.js index f9bc3db..5e6a841 100644 --- a/remoting/webapp/crd/js/window_frame.js +++ b/remoting/webapp/crd/js/window_frame.js @@ -61,7 +61,7 @@ remoting.WindowFrame = function(titleBar) { base.debug.assert(this.optionsMenuList_ != null); /** - * @type {Array.<{cls:string, fn: function()}>} + * @type {Array<{cls:string, fn: function()}>} */ var handlers = [ { cls: 'window-disconnect', fn: this.disconnectSession_.bind(this) }, diff --git a/remoting/webapp/crd/js/xhr.js b/remoting/webapp/crd/js/xhr.js index d37e773..258ff0e 100644 --- a/remoting/webapp/crd/js/xhr.js +++ b/remoting/webapp/crd/js/xhr.js @@ -19,7 +19,7 @@ remoting.xhr = remoting.xhr || {}; /** * Takes an associative array of parameters and urlencodes it. * - * @param {Object.<string>} paramHash The parameter key/value pairs. + * @param {Object<string>} paramHash The parameter key/value pairs. * @return {string} URLEncoded version of paramHash. */ remoting.xhr.urlencodeParamHash = function(paramHash) { @@ -40,10 +40,10 @@ remoting.xhr.urlencodeParamHash = function(paramHash) { * @param {string} url The base URL to GET, excluding parameters. * @param {function(XMLHttpRequest):void} onDone The function to call on * completion. - * @param {(string|Object.<string>)=} opt_parameters The request parameters, + * @param {(string|Object<string>)=} opt_parameters The request parameters, * either as an associative array, or a string. If it is a string, do * not include the ? and be sure it is correctly URLEncoded. - * @param {Object.<string>=} opt_headers Additional headers to include on the + * @param {Object<string>=} opt_headers Additional headers to include on the * request. * @param {boolean=} opt_withCredentials Set the withCredentials flags in the * XHR. @@ -61,10 +61,10 @@ remoting.xhr.get = function(url, onDone, opt_parameters, opt_headers, * @param {string} url The base URL to POST, excluding parameters. * @param {function(XMLHttpRequest):void} onDone The function to call on * completion. - * @param {(string|Object.<string>)=} opt_parameters The request parameters, + * @param {(string|Object<string>)=} opt_parameters The request parameters, * either as an associative array, or a string. If it is a string, be * sure it is correctly URLEncoded. - * @param {Object.<string>=} opt_headers Additional headers to include on the + * @param {Object<string>=} opt_headers Additional headers to include on the * request. * @param {boolean=} opt_withCredentials Set the withCredentials flags in the * XHR. @@ -82,10 +82,10 @@ remoting.xhr.post = function(url, onDone, opt_parameters, opt_headers, * @param {string} url The base URL to DELETE, excluding parameters. * @param {function(XMLHttpRequest):void} onDone The function to call on * completion. - * @param {(string|Object.<string>)=} opt_parameters The request parameters, + * @param {(string|Object<string>)=} opt_parameters The request parameters, * either as an associative array, or a string. If it is a string, be * sure it is correctly URLEncoded. - * @param {Object.<string>=} opt_headers Additional headers to include on the + * @param {Object<string>=} opt_headers Additional headers to include on the * request. * @param {boolean=} opt_withCredentials Set the withCredentials flags in the * XHR. @@ -103,10 +103,10 @@ remoting.xhr.remove = function(url, onDone, opt_parameters, opt_headers, * @param {string} url The base URL to PUT, excluding parameters. * @param {function(XMLHttpRequest):void} onDone The function to call on * completion. - * @param {(string|Object.<string>)=} opt_parameters The request parameters, + * @param {(string|Object<string>)=} opt_parameters The request parameters, * either as an associative array, or a string. If it is a string, be * sure it is correctly URLEncoded. - * @param {Object.<string>=} opt_headers Additional headers to include on the + * @param {Object<string>=} opt_headers Additional headers to include on the * request. * @param {boolean=} opt_withCredentials Set the withCredentials flags in the * XHR. @@ -125,10 +125,10 @@ remoting.xhr.put = function(url, onDone, opt_parameters, opt_headers, * @param {string} url The base URL, excluding parameters. * @param {function(XMLHttpRequest):void} onDone The function to call on * completion. - * @param {(string|Object.<string>)=} opt_parameters The request parameters, + * @param {(string|Object<string>)=} opt_parameters The request parameters, * either as an associative array, or a string. If it is a string, be * sure it is correctly URLEncoded. - * @param {Object.<string>=} opt_headers Additional headers to include on the + * @param {Object<string>=} opt_headers Additional headers to include on the * request. * @param {boolean=} opt_withCredentials Set the withCredentials flags in the * XHR. diff --git a/remoting/webapp/crd/js/xmpp_connection.js b/remoting/webapp/crd/js/xmpp_connection.js index 18e69ac..1f0cffc 100644 --- a/remoting/webapp/crd/js/xmpp_connection.js +++ b/remoting/webapp/crd/js/xmpp_connection.js @@ -37,7 +37,7 @@ remoting.XmppConnection = function() { this.sendPending_ = false; /** @private */ this.startTlsPending_ = false; - /** @type {Array.<ArrayBuffer>} @private */ + /** @type {Array<ArrayBuffer>} @private */ this.sendQueue_ = []; /** @type {remoting.XmppLoginHandler} @private*/ this.loginHandler_ = null; diff --git a/remoting/webapp/js_proto/chrome_proto.js b/remoting/webapp/js_proto/chrome_proto.js index 99fb459..afa0d03 100644 --- a/remoting/webapp/js_proto/chrome_proto.js +++ b/remoting/webapp/js_proto/chrome_proto.js @@ -43,7 +43,7 @@ chrome.app.window = { */ get: function(id) {}, /** - * @return {Array.<AppWindow>} + * @return {Array<AppWindow>} */ getAll: function() {} }; @@ -150,7 +150,7 @@ chrome.i18n = {}; /** * @param {string} messageName - * @param {(string|Array.<string>)=} opt_args + * @param {(string|Array<string>)=} opt_args * @return {string} */ chrome.i18n.getMessage = function(messageName, opt_args) {}; @@ -174,21 +174,21 @@ chrome.storage.sync; chrome.Storage = function() {}; /** - * @param {string|Array.<string>|Object.<string>} items - * @param {function(Object.<string>):void} callback + * @param {string|Array<string>|Object<string>} items + * @param {function(Object<string>):void} callback * @return {void} */ chrome.Storage.prototype.get = function(items, callback) {}; /** - * @param {Object.<string>} items + * @param {Object<string>} items * @param {function():void=} opt_callback * @return {void} */ chrome.Storage.prototype.set = function(items, opt_callback) {}; /** - * @param {string|Array.<string>} items + * @param {string|Array<string>} items * @param {function():void=} opt_callback * @return {void} */ @@ -258,8 +258,8 @@ OnClickData.prototype.checked; /** @type {Object} */ chrome.fileSystem = { /** - * @param {Object.<string>?} options - * @param {function(Entry, Array.<FileEntry>):void} callback + * @param {Object<string>?} options + * @param {function(Entry, Array<FileEntry>):void} callback */ chooseEntry: function(options, callback) {}, /** @@ -275,17 +275,17 @@ Entry.prototype.createWriter = function(callback) {}; /** @type {Object} */ chrome.identity = { /** - * @param {Object.<string>} parameters + * @param {Object<string>} parameters * @param {function(string):void} callback */ getAuthToken: function(parameters, callback) {}, /** - * @param {Object.<string>} parameters + * @param {Object<string>} parameters * @param {function():void} callback */ removeCachedAuthToken: function(parameters, callback) {}, /** - * @param {Object.<string>} parameters + * @param {Object<string>} parameters * @param {function(string):void} callback */ launchWebAuthFlow: function(parameters, callback) {} @@ -295,12 +295,12 @@ chrome.identity = { /** @type {Object} */ chrome.permissions = { /** - * @param {Object.<string>} permissions + * @param {Object<string>} permissions * @param {function(boolean):void} callback */ contains: function(permissions, callback) {}, /** - * @param {Object.<string>} permissions + * @param {Object<string>} permissions * @param {function(boolean):void} callback */ request: function(permissions, callback) {} @@ -408,12 +408,12 @@ AppWindow.prototype.isFullscreen = function() {}; AppWindow.prototype.isMaximized = function() {}; /** - * @param {{rects: Array.<ClientRect>}} rects + * @param {{rects: Array<ClientRect>}} rects */ AppWindow.prototype.setShape = function(rects) {}; /** - * @param {{rects: Array.<ClientRect>}} rects + * @param {{rects: Array<ClientRect>}} rects */ AppWindow.prototype.setInputRegion = function(rects) {}; @@ -421,7 +421,7 @@ AppWindow.prototype.setInputRegion = function(rects) {}; var LaunchData = function() { /** @type {string} */ this.id = ''; - /** @type {Array.<{type: string, entry: FileEntry}>} */ + /** @type {Array<{type: string, entry: FileEntry}>} */ this.items = []; }; @@ -484,7 +484,7 @@ chrome.cast.media.Media = function() { /** @constructor */ chrome.cast.Session = function() { - /** @type {Array.<chrome.cast.media.Media>} */ + /** @type {Array<chrome.cast.media.Media>} */ this.media = []; /** @type {string} */ diff --git a/remoting/webapp/js_proto/dom_proto.js b/remoting/webapp/js_proto/dom_proto.js index 518bebc..a81cdc2 100644 --- a/remoting/webapp/js_proto/dom_proto.js +++ b/remoting/webapp/js_proto/dom_proto.js @@ -6,13 +6,13 @@ // WebKit- and Chrome-specific properties and methods. It is used only with // JSCompiler to verify the type-correctness of our code. -/** @type {Array.<string>} */ +/** @type {Array<string>} */ ClipboardData.prototype.types; /** @type {HTMLElement} */ Document.prototype.activeElement; -/** @type {Array.<HTMLElement>} */ +/** @type {Array<HTMLElement>} */ Document.prototype.all; /** @type {boolean} */ diff --git a/remoting/webapp/js_proto/remoting_proto.js b/remoting/webapp/js_proto/remoting_proto.js index 163f4f7..805fdf2 100644 --- a/remoting/webapp/js_proto/remoting_proto.js +++ b/remoting/webapp/js_proto/remoting_proto.js @@ -13,7 +13,7 @@ var remoting = remoting || {}; */ remoting.WcsIqClient = function() {}; -/** @param {function(Array.<string>): void} onMsg The function called when a +/** @param {function(Array<string>): void} onMsg The function called when a * message is received. * @return {void} Nothing. */ remoting.WcsIqClient.prototype.setOnMessage = function(onMsg) {}; diff --git a/remoting/webapp/unittests/chrome_mocks.js b/remoting/webapp/unittests/chrome_mocks.js index 827cdf5..6bdd7b5c 100644 --- a/remoting/webapp/unittests/chrome_mocks.js +++ b/remoting/webapp/unittests/chrome_mocks.js @@ -118,7 +118,7 @@ var originals_ = null; /** * Activates a list of Chrome components to mock - * @param {Array.<string>} components + * @param {Array<string>} components */ chromeMocks.activate = function(components) { if (originals_) { |