summaryrefslogtreecommitdiffstats
path: root/extensions/browser
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 08:41:07 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 08:41:07 +0000
commita0ed268cd52dfe77b86f967f9c98e30f73414140 (patch)
tree9c1b5cebffb3f283669c690116a54f589c7d09d6 /extensions/browser
parent28c3d0a9c7f17208100e97cfb428538d1214e087 (diff)
downloadchromium_src-a0ed268cd52dfe77b86f967f9c98e30f73414140.zip
chromium_src-a0ed268cd52dfe77b86f967f9c98e30f73414140.tar.gz
chromium_src-a0ed268cd52dfe77b86f967f9c98e30f73414140.tar.bz2
Expand RuntimeErrors for ErrorConsole
Include two of our internal scripts (event_bindings and schemaUtil) as sources for runtime errors. Add tests for same. BUG=21734 Review URL: https://chromiumcodereview.appspot.com/23923003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser')
-rw-r--r--extensions/browser/extension_error.cc5
-rw-r--r--extensions/browser/extension_error.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/extensions/browser/extension_error.cc b/extensions/browser/extension_error.cc
index 272028e..02c218e 100644
--- a/extensions/browser/extension_error.cc
+++ b/extensions/browser/extension_error.cc
@@ -120,14 +120,15 @@ bool ManifestError::IsEqualImpl(const ExtensionError* rhs) const {
return true;
}
-RuntimeError::RuntimeError(bool from_incognito,
+RuntimeError::RuntimeError(const std::string& extension_id,
+ bool from_incognito,
const string16& source,
const string16& message,
const StackTrace& stack_trace,
const GURL& context_url,
logging::LogSeverity level)
: ExtensionError(ExtensionError::RUNTIME_ERROR,
- GURL(source).host(),
+ !extension_id.empty() ? extension_id : GURL(source).host(),
from_incognito,
level,
source,
diff --git a/extensions/browser/extension_error.h b/extensions/browser/extension_error.h
index 7e02bb3..735f2a2 100644
--- a/extensions/browser/extension_error.h
+++ b/extensions/browser/extension_error.h
@@ -120,7 +120,8 @@ class ManifestError : public ExtensionError {
class RuntimeError : public ExtensionError {
public:
- RuntimeError(bool from_incognito,
+ RuntimeError(const std::string& extension_id, // optional, sometimes unknown.
+ bool from_incognito,
const base::string16& source,
const base::string16& message,
const StackTrace& stack_trace,