Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / chrome_extension_web_contents_observer.cc

diff --git a/src/chrome/browser/extensions/chrome_extension_web_contents_observer.cc b/src/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
index cc31073..99b4370 100644 (file)
--- a/src/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
+++ b/src/chrome/browser/extensions/chrome_extension_web_contents_observer.cc
@@ -4,17 +4,14 @@
 
 #include "chrome/browser/extensions/chrome_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/common/render_messages.h"
+#include "chrome/common/extensions/chrome_extension_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/common/api/messaging/message.h"
-#include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_urls.h"
 
 using content::BrowserContext;
@@ -37,28 +34,14 @@ void ChromeExtensionWebContentsObserver::RenderViewCreated(
 }
 
 bool ChromeExtensionWebContentsObserver::OnMessageReceived(
-    const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message)
-    IPC_MESSAGE_HANDLER(ExtensionHostMsg_PostMessage, OnPostMessage)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-bool ChromeExtensionWebContentsObserver::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
-#if defined(ENABLE_EXTENSIONS)
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeExtensionWebContentsObserver, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DetailedConsoleMessageAdded,
                         OnDetailedConsoleMessageAdded)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
-#else
-  bool handled = false;
-#endif
   return handled;
 }
 
@@ -67,7 +50,6 @@ void ChromeExtensionWebContentsObserver::OnDetailedConsoleMessageAdded(
     const base::string16& source,
     const StackTrace& stack_trace,
     int32 severity_level) {
-#if defined(ENABLE_EXTENSIONS)
   if (!IsSourceFromAnExtension(source))
     return;
 
@@ -88,15 +70,6 @@ void ChromeExtensionWebContentsObserver::OnDetailedConsoleMessageAdded(
                            static_cast<logging::LogSeverity>(severity_level),
                            render_view_host->GetRoutingID(),
                            render_view_host->GetProcess()->GetID())));
-#endif
-}
-
-void ChromeExtensionWebContentsObserver::OnPostMessage(int port_id,
-                                                       const Message& message) {
-  MessageService* message_service = MessageService::Get(browser_context());
-  if (message_service) {
-    message_service->PostMessage(port_id, message);
-  }
 }
 
 void ChromeExtensionWebContentsObserver::ReloadIfTerminated(