Index: chrome/browser/extensions/tab_helper.cc |
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc |
index ac7620c4440e913eda0cd8664c35a0196566ac0f..50ca9bc12dadc3df4a3f5516007769daeaa4d390 100644 |
--- a/chrome/browser/extensions/tab_helper.cc |
+++ b/chrome/browser/extensions/tab_helper.cc |
@@ -9,6 +9,7 @@ |
#include "chrome/browser/extensions/api/declarative/rules_registry_service.h" |
#include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h" |
#include "chrome/browser/extensions/crx_installer.h" |
+#include "chrome/browser/extensions/error_console/error_console.h" |
#include "chrome/browser/extensions/extension_action.h" |
#include "chrome/browser/extensions/extension_action_manager.h" |
#include "chrome/browser/extensions/extension_service.h" |
@@ -45,7 +46,9 @@ |
#include "content/public/browser/render_widget_host_view.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_contents_view.h" |
+#include "extensions/browser/extension_error.h" |
#include "extensions/common/extension_resource.h" |
+#include "extensions/common/extension_urls.h" |
#include "ui/gfx/image/image.h" |
using content::NavigationController; |
@@ -253,6 +256,24 @@ void TabHelper::DidCloneToNewWebContents(WebContents* old_web_contents, |
new_helper->extension_app_icon_ = extension_app_icon_; |
} |
+void TabHelper::OnMessageAddedToConsole(const base::string16& source, |
+ const base::string16& message, |
+ const base::string16& stack_trace, |
+ int32 line_number, |
+ logging::LogSeverity level) { |
+ if (IsSourceFromAnExtension(source)) { |
+ ErrorConsole::Get(profile_)->ReportError( |
+ scoped_ptr<const ExtensionError>(new JavascriptRuntimeError( |
+ profile_->IsOffTheRecord(), |
+ source, |
+ message, |
+ stack_trace, |
+ line_number, |
+ web_contents() ? |
+ web_contents()->GetLastCommittedURL() : GURL::EmptyGURL(), |
+ level))); |
+ } |
+} |
void TabHelper::OnDidGetApplicationInfo(int32 page_id, |
const WebApplicationInfo& info) { |