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

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

Issue 1060973004: Enable tests related to the extensions web ui that were flaky. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + remove comment Created 5 years, 7 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 var buttons = devControls.querySelector('.button-container'); 338 var buttons = devControls.querySelector('.button-container');
339 Array.prototype.forEach.call(buttons.querySelectorAll('a, button'), 339 Array.prototype.forEach.call(buttons.querySelectorAll('a, button'),
340 function(control) { 340 function(control) {
341 control.tabIndex = showDevControls ? 0 : -1; 341 control.tabIndex = showDevControls ? 0 : -1;
342 }); 342 });
343 buttons.setAttribute('aria-hidden', !showDevControls); 343 buttons.setAttribute('aria-hidden', !showDevControls);
344 344
345 window.requestAnimationFrame(function() { 345 window.requestAnimationFrame(function() {
346 devControls.style.height = !showDevControls ? '' : 346 devControls.style.height = !showDevControls ? '' :
347 buttons.offsetHeight + 'px'; 347 buttons.offsetHeight + 'px';
348
349 if (this.testingDeveloperModeCallback)
not at google - send to devlin 2015/04/29 22:03:31 Where is this defined?
hcarmona 2015/04/30 18:42:00 Defined now.
350 this.testingDeveloperModeCallback();
348 }.bind(this)); 351 }.bind(this));
349 }, 352 },
350 }; 353 };
351 354
352 ExtensionSettings.onExtensionsChanged = function() { 355 ExtensionSettings.onExtensionsChanged = function() {
353 ExtensionSettings.getInstance().update_(); 356 ExtensionSettings.getInstance().update_();
354 }; 357 };
355 358
356 /** 359 /**
357 * Returns the current overlay or null if one does not exist. 360 * Returns the current overlay or null if one does not exist.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 // Export 461 // Export
459 return { 462 return {
460 ExtensionSettings: ExtensionSettings 463 ExtensionSettings: ExtensionSettings
461 }; 464 };
462 }); 465 });
463 466
464 window.addEventListener('load', function(e) { 467 window.addEventListener('load', function(e) {
465 document.documentElement.classList.add('loading'); 468 document.documentElement.classList.add('loading');
466 extensions.ExtensionSettings.getInstance().initialize(); 469 extensions.ExtensionSettings.getInstance().initialize();
467 }); 470 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698