| 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 ec0b53e578e8b12f2296b3883925af97f15e0bf1..c2a0c85db582f6f113726ccc9d10e0e6b66c3ea7 100644
|
| --- a/chrome/browser/resources/extensions/extension_list.js
|
| +++ b/chrome/browser/resources/extensions/extension_list.js
|
| @@ -305,14 +305,22 @@ cr.define('options', function() {
|
| });
|
| }
|
|
|
| - // The manifest errors and warnings, in one of two formats (depending on
|
| - // if the ErrorConsole is enabled).
|
| + // If the ErrorConsole is enabled, we should have manifest and/or runtime
|
| + // errors. Otherwise, we may have install warnings. We should not have
|
| + // both ErrorConsole errors and install warnings.
|
| if (extension.manifestErrors) {
|
| - var manifestErrors = node.querySelector('.manifest-errors');
|
| - manifestErrors.hidden = false;
|
| - manifestErrors.appendChild(
|
| - new extensions.ExtensionErrorList(extension.manifestErrors));
|
| - } else if (extension.installWarnings) {
|
| + var panel = node.querySelector('.manifest-errors');
|
| + panel.hidden = false;
|
| + panel.appendChild(new extensions.ExtensionErrorList(
|
| + extension.manifestErrors, 'extensionErrorsManifestErrors'));
|
| + }
|
| + if (extension.runtimeErrors) {
|
| + var panel = node.querySelector('.runtime-errors');
|
| + panel.hidden = false;
|
| + panel.appendChild(new extensions.ExtensionErrorList(
|
| + extension.runtimeErrors, 'extensionErrorsRuntimeErrors'));
|
| + }
|
| + if (extension.installWarnings) {
|
| var panel = node.querySelector('.install-warnings');
|
| panel.hidden = false;
|
| var list = panel.querySelector('ul');
|
|
|