Make ErrorConsole catch errors from Extension WebContents Views

chrome/browser/extensions/extension_web_contents_observer.cc

 // 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 "chrome/browser/extensions/extension_web_contents_observer.h"
 
 #include "chrome/browser/extensions/api/messaging/message_service.h"
+#include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/common/extensions/api/messaging/message.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/extension_urls.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::ExtensionWebContentsObserver);
 
 namespace extensions {
 
 ExtensionWebContentsObserver::ExtensionWebContentsObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       browser_context_(web_contents->GetBrowserContext()) {
 }
 
 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() {
 }
 
 void ExtensionWebContentsObserver::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   render_view_host->Send(new ExtensionMsg_NotifyRenderViewType(
       render_view_host->GetRoutingID(),
-      extensions::GetViewType(web_contents())));
+      GetViewType(web_contents())));
 
   const Extension* extension = GetExtension(render_view_host);
   if (!extension)
     return;
 
   content::RenderProcessHost* process = render_view_host->GetProcess();
 
   // Some extensions use chrome:// URLs.
   // This is a temporary solution. Replace it with access to chrome-static://
   // once it is implemented. See: crbug.com/226927.
@@ skipping 38 matching lines @@
     case Manifest::TYPE_SHARED_MODULE:
       break;
   }
 }
 
 bool ExtensionWebContentsObserver::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionWebContentsObserver, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_PostMessage, OnPostMessage)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
+                        OnDetailedConsoleMessageAdded)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void ExtensionWebContentsObserver::OnDetailedConsoleMessageAdded(
+    const base::string16& message,
+    const base::string16& source,
+    const StackTrace& stack_trace,
+    int32 severity_level) {
+  if (IsSourceFromAnExtension(source)) {
+    content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
+    ErrorConsole::Get(Profile::FromBrowserContext(browser_context_))->
+        ReportError(
+            scoped_ptr<ExtensionError>(new RuntimeError(
+                std::string(),
+                browser_context_->IsOffTheRecord(),
+                source,
+                message,
+                stack_trace,
+                web_contents() ?
+                    web_contents()->GetLastCommittedURL() : GURL::EmptyGURL(),
+                static_cast<logging::LogSeverity>(severity_level),
+                rvh->GetRoutingID(),
+                rvh->GetProcess()->GetID())));
+  }
+}
+
 void ExtensionWebContentsObserver::OnPostMessage(int port_id,
                                                  const Message& message) {
   MessageService* message_service = MessageService::Get(browser_context_);
   if (message_service) {
     message_service->PostMessage(port_id, message);
   }
 }
 
 const Extension* ExtensionWebContentsObserver::GetExtension(
     content::RenderViewHost* render_view_host) {
@@ skipping 17 matching lines @@
     ExtensionSystem::GetForBrowserContext(browser_context_)->
         extension_service()->ReloadExtension(extension_id);
   }
 
   // May be null if the extension doesn't exist, for example if somebody typos
   // a chrome-extension:// URL.
   return registry->enabled_extensions().GetByID(extension_id);
 }
 
 }  // namespace extensions