Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: chrome/browser/resources/extensions/extensions.js

Issue 1064573003: Fix scroll regression when specifying an extension id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move visibility check Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 <include src="../../../../ui/webui/resources/js/cr/ui/focus_row.js"> 5 <include src="../../../../ui/webui/resources/js/cr/ui/focus_row.js">
6 <include src="../../../../ui/webui/resources/js/cr/ui/focus_grid.js"> 6 <include src="../../../../ui/webui/resources/js/cr/ui/focus_grid.js">
7 <include src="../uber/uber_utils.js"> 7 <include src="../uber/uber_utils.js">
8 <include src="extension_code.js"> 8 <include src="extension_code.js">
9 <include src="extension_commands_overlay.js"> 9 <include src="extension_commands_overlay.js">
10 <include src="extension_error_overlay.js"> 10 <include src="extension_error_overlay.js">
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 // be careful to remove the 'finished loading' timeout. 320 // be careful to remove the 'finished loading' timeout.
321 if (this.loadingTimeout_) 321 if (this.loadingTimeout_)
322 window.clearTimeout(this.loadingTimeout_); 322 window.clearTimeout(this.loadingTimeout_);
323 this.loadingTimeout_ = window.setTimeout(function() { 323 this.loadingTimeout_ = window.setTimeout(function() {
324 document.documentElement.classList.remove('loading'); 324 document.documentElement.classList.remove('loading');
325 }, 0); 325 }, 0);
326 326
327 var hasExtensions = extensionList.getNumExtensions() != 0; 327 var hasExtensions = extensionList.getNumExtensions() != 0;
328 $('no-extensions').hidden = hasExtensions; 328 $('no-extensions').hidden = hasExtensions;
329 $('extension-list-wrapper').hidden = !hasExtensions; 329 $('extension-list-wrapper').hidden = !hasExtensions;
330 $('extension-settings-list').updateFocusableElements(); 330 if (hasExtensions)
331 extensionList.updateVisible();
331 }.bind(this)); 332 }.bind(this));
332 }; 333 };
333 334
334 /** 335 /**
335 * Returns the current overlay or null if one does not exist. 336 * Returns the current overlay or null if one does not exist.
336 * @return {Element} The overlay element. 337 * @return {Element} The overlay element.
337 */ 338 */
338 ExtensionSettings.getCurrentOverlay = function() { 339 ExtensionSettings.getCurrentOverlay = function() {
339 return document.querySelector('#overlay .page.showing'); 340 return document.querySelector('#overlay .page.showing');
340 }; 341 };
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 // Export 438 // Export
438 return { 439 return {
439 ExtensionSettings: ExtensionSettings 440 ExtensionSettings: ExtensionSettings
440 }; 441 };
441 }); 442 });
442 443
443 window.addEventListener('load', function(e) { 444 window.addEventListener('load', function(e) {
444 document.documentElement.classList.add('loading'); 445 document.documentElement.classList.add('loading');
445 extensions.ExtensionSettings.getInstance().initialize(); 446 extensions.ExtensionSettings.getInstance().initialize();
446 }); 447 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698