Integrate ErrorConsole with Apps Dev Tool

chrome/browser/resources/extensions/extension_error.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 <include src="extension_error_overlay.js"></include>
 
 cr.define('extensions', function() {
   'use strict';
 
   /**
@@ skipping 23 matching lines @@
    * @constructor
    * @extends {HTMLDivElement}
    */
   function ExtensionError(error) {
     var div = cloneTemplate('extension-error-metadata');
     div.__proto__ = ExtensionError.prototype;
     div.decorate(error);
     return div;
   }
 
-  /**
-   * The manifest filename.
-   * @type {string}
-   * @const
-   * @private
-   */
-  ExtensionError.MANIFEST_FILENAME_ = 'manifest.json';
-
-  /**
-   * Determine whether or not chrome can load the source for a given file; this
-   * can only be done if the file belongs to the extension.
-   * @param {string} file The file to load.
-   * @param {string} extensionUrl The url for the extension, in the form
-   *     chrome-extension://<extension-id>/.
-   * @return {boolean} True if the file can be loaded, false otherwise.
-   * @private
-   */
-  ExtensionError.canLoadFileSource_ = function(file, extensionUrl) {
-    return RegExp('^' + extensionUrl).test(file) ||
-           file.toLowerCase() == ExtensionError.MANIFEST_FILENAME_;
-  };
-
-  /**
-   * Determine whether or not there are any user-friendly (non-internal) frames
-   * in the error's stack trace.
-   * @param {Object} error The error to examine.
-   * @return {boolean} True if there are user-friendly stack frames for the
-   *     error, false otherwise.
-   * @private
-   */
-  ExtensionError.hasExternalStackFrames_ = function(error) {
-    // All our internal source begins with the "extensions::" prefix.
-    var extensionPrefix = /^extensions::/;
-    for (var i = 0; i < error.stackTrace.length; ++i) {
-      if (!extensionPrefix.test(error.stackTrace[i].url))
-        return true;
-    }
-    return false;
-  };
-
   ExtensionError.prototype = {
     __proto__: HTMLDivElement.prototype,
 
     /** @override */
     decorate: function(error) {
       // Add an additional class for the severity level.
       if (error.level == 0)
         this.classList.add('extension-error-severity-info');
       else if (error.level == 1)
         this.classList.add('extension-error-severity-warning');
       else
         this.classList.add('extension-error-severity-fatal');
 
       var iconNode = document.createElement('img');
       iconNode.className = 'extension-error-icon';
       this.insertBefore(iconNode, this.firstChild);
 
       var messageSpan = this.querySelector('.extension-error-message');
       messageSpan.textContent = error.message;
       messageSpan.title = error.message;
 
       var extensionUrl = 'chrome-extension://' + error.extensionId + '/';
       var viewDetailsLink = this.querySelector('.extension-error-view-details');
 
       // If we cannot open the file source and there are no external frames in
       // the stack, then there are no details to display.
-      if (!ExtensionError.canLoadFileSource_(error.source, extensionUrl) &&
-          !ExtensionError.hasExternalStackFrames_(error)) {
+      if (!extensions.ExtensionErrorOverlay.canShowOverlayForError(
+              error, extensionUrl)) {
         viewDetailsLink.hidden = true;
-        return;
+      } else {
+        var stringId = extensionUrl.toLowerCase() == 'manifest.json' ?
+            'extensionErrorViewManifest' : 'extensionErrorViewDetails';
+        viewDetailsLink.textContent = loadTimeData.getString(stringId);
+
+        viewDetailsLink.addEventListener('click', function(e) {
+          extensions.ExtensionErrorOverlay.getInstance().setErrorAndShowOverlay(
+              error, extensionUrl);
+        });
       }
-
-      // The relative url is the url without the preceeding
-      // "chrome-extension://<id>"; this is the format which the
-      // requestFileSource call expects.
-      var relativeUrl =
-          error.source.substring(0, extensionUrl.length) == extensionUrl ?
-              error.source.substring(extensionUrl.length) : error.source;
-
-      var requestFileSourceArgs = {extensionId: error.extensionId,
-                                   message: error.message,
-                                   pathSuffix: relativeUrl};
-
-      var viewDetailsStringId;
-      if (relativeUrl.toLowerCase() == 'manifest.json') {
-        requestFileSourceArgs.manifestKey = error.manifestKey;
-        requestFileSourceArgs.manifestSpecific = error.manifestSpecific;
-        viewDetailsStringId = 'extensionErrorViewManifest';
-      } else {
-        requestFileSourceArgs.lineNumber =
-            error.stackTrace && error.stackTrace[0] ?
-                error.stackTrace[0].lineNumber : 0;
-        viewDetailsStringId = 'extensionErrorViewDetails';
-      }
-      viewDetailsLink.textContent = loadTimeData.getString(viewDetailsStringId);
-
-      viewDetailsLink.addEventListener('click', function(e) {
-        var overlay = extensions.ExtensionErrorOverlay.getInstance();
-        overlay.setError(error);
-
-        // If we can, request the file source to show to the user in the
-        // overlay. Otherwise, simply show the overlay.
-        if (ExtensionError.canLoadFileSource_(error.source, extensionUrl)) {
-          chrome.send('extensionErrorRequestFileSource',
-                      [requestFileSourceArgs]);
-        } else {
-          overlay.requestFileSourceResponse(null);
-        }
-      }.bind(this));
     },
   };
 
   /**
    * A variable length list of runtime or manifest errors for a given extension.
    * @param {Array.<Object>} errors The list of extension errors with which
    *     to populate the list.
    * @constructor
    * @extends {HTMLDivElement}
    */
@@ skipping 53 matching lines @@
         button.textContent = loadTimeData.getString(message);
         button.isShowingAll = !button.isShowingAll;
       }.bind(this));
     }
   };
 
   return {
     ExtensionErrorList: ExtensionErrorList
   };
 });