| Index: chrome/browser/resources/net_internals/chromeos_view.js
|
| diff --git a/chrome/browser/resources/net_internals/chromeos_view.js b/chrome/browser/resources/net_internals/chromeos_view.js
|
| index 344b0e72d1a992faad1624b51f7f3b08c1542fb1..b0c91b1f34523748c0764d7bd6dd7d7207ae3d2e 100644
|
| --- a/chrome/browser/resources/net_internals/chromeos_view.js
|
| +++ b/chrome/browser/resources/net_internals/chromeos_view.js
|
| @@ -33,7 +33,7 @@ var CrosView = (function() {
|
| if (fileContent)
|
| g_browser.importONCFile(fileContent, passcode);
|
| else
|
| - setParseStatus_('ONC file parse failed: cannot read file');
|
| + setParseStatus_('ONC file parse failed: cannot read file', false);
|
| clearFileInput_();
|
| }
|
|
|
| @@ -90,7 +90,7 @@ var CrosView = (function() {
|
| *
|
| * @private
|
| */
|
| - function clearParseStatus_(error) {
|
| + function clearParseStatus_() {
|
| var parseStatus = $(CrosView.PARSE_STATUS_ID);
|
| parseStatus.hidden = true;
|
| parseStatus.textContent = '';
|
| @@ -101,11 +101,22 @@ var CrosView = (function() {
|
| *
|
| * @private
|
| */
|
| - function setParseStatus_(error) {
|
| + function setParseStatus_(message, success) {
|
| var parseStatus = $(CrosView.PARSE_STATUS_ID);
|
| parseStatus.hidden = false;
|
| - parseStatus.textContent = error ?
|
| - 'ONC file parse failed: ' + error : 'ONC file successfully parsed';
|
| +
|
| + if (success) {
|
| + if (message) {
|
| + message = 'ONC file parsed and imported, however with warnings:\n' +
|
| + message;
|
| + } else {
|
| + message = 'ONC file parsed and imported.';
|
| + }
|
| + } else {
|
| + message = 'ONC file parse failed:\n' + message;
|
| + }
|
| +
|
| + parseStatus.innerHTML = message.replace(/\n/g, '<br>');
|
| reset_();
|
| }
|
|
|
|
|