| Index: chrome/browser/resources/extensions/extension_list.js
|
| diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js
|
| index 08fb75e0ad1412d505af64b9625c3ff909b23254..c54e9a1371725191ed850f5d39fd08d5574c9e4c 100644
|
| --- a/chrome/browser/resources/extensions/extension_list.js
|
| +++ b/chrome/browser/resources/extensions/extension_list.js
|
| @@ -33,6 +33,15 @@ cr.define('options', function() {
|
| ExtensionsList.prototype = {
|
| __proto__: HTMLDivElement.prototype,
|
|
|
| + /**
|
| + * Indicates whether an embedded options page that was navigated to through
|
| + * the '?options=' URL query has been shown to the user. This is necessary
|
| + * to prevent showExtensionNodes_ from opening the options more than once.
|
| + * @type {boolean}
|
| + * @private
|
| + */
|
| + optionsShown_: false,
|
| +
|
| /** @override */
|
| decorate: function() {
|
| this.textContent = '';
|
| @@ -44,6 +53,10 @@ cr.define('options', function() {
|
| return parseQueryParams(document.location)['id'];
|
| },
|
|
|
| + getOptionsQueryParam_: function() {
|
| + return parseQueryParams(document.location)['options'];
|
| + },
|
| +
|
| /**
|
| * Creates all extension items from scratch.
|
| * @private
|
| @@ -54,14 +67,14 @@ cr.define('options', function() {
|
|
|
| var idToHighlight = this.getIdQueryParam_();
|
| if (idToHighlight && $(idToHighlight)) {
|
| - // Scroll offset should be calculated slightly higher than the actual
|
| - // offset of the element being scrolled to, so that it ends up not all
|
| - // the way at the top. That way it is clear that there are more elements
|
| - // above the element being scrolled to.
|
| - var scrollFudge = 1.2;
|
| - var scrollTop = $(idToHighlight).offsetTop - scrollFudge *
|
| - $(idToHighlight).clientHeight;
|
| - setScrollTopForDocument(document, scrollTop);
|
| + this.scrollToNode_(idToHighlight);
|
| + }
|
| +
|
| + var idToOpenOptions = this.getOptionsQueryParam_();
|
| + if (idToOpenOptions && $(idToOpenOptions) && !this.optionsShown_) {
|
| + this.scrollToNode_(idToOpenOptions);
|
| + $(idToOpenOptions).querySelector('.options-link').click();
|
| + this.optionsShown_ = true;
|
| }
|
|
|
| if (this.data_.extensions.length == 0)
|
| @@ -71,6 +84,22 @@ cr.define('options', function() {
|
| },
|
|
|
| /**
|
| + * Scrolls the page down to the extension node with the given id.
|
| + * @param {string} extensionId The id of the extension to scroll to.
|
| + * @private
|
| + */
|
| + scrollToNode_: function(extensionId) {
|
| + // Scroll offset should be calculated slightly higher than the actual
|
| + // offset of the element being scrolled to, so that it ends up not all
|
| + // the way at the top. That way it is clear that there are more elements
|
| + // above the element being scrolled to.
|
| + var scrollFudge = 1.2;
|
| + var scrollTop = $(extensionId).offsetTop - scrollFudge *
|
| + $(extensionId).clientHeight;
|
| + setScrollTopForDocument(document, scrollTop);
|
| + },
|
| +
|
| + /**
|
| * Synthesizes and initializes an HTML element for the extension metadata
|
| * given in |extension|.
|
| * @param {Object} extension A dictionary of extension metadata.
|
|
|