Move dispatching and sending of the last extension specific messages out of TabContents and Rende...

chrome/browser/notifications/balloon_host.cc

 // Copyright (c) 2011 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/notifications/balloon_host.h"
 
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/extensions/extension_message_handler.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/render_messages.h"
@@ skipping 45 matching lines @@
   // TODO(aa): Should this return the native view of the BalloonView*?
   return NULL;
 }
 
 TabContents* BalloonHost::associated_tab_contents() const { return NULL; }
 
 const string16& BalloonHost::GetSource() const {
   return balloon_->notification().display_source();
 }
 
+bool BalloonHost::OnMessageReceived(const IPC::Message& message) {
+  if (!extension_message_handler_.get())
+    return false;
+  return extension_message_handler_->OnMessageReceived(message);
+}
+
 WebPreferences BalloonHost::GetWebkitPrefs() {
   WebPreferences web_prefs =
       RenderViewHostDelegateHelper::GetWebkitPrefs(GetProfile(),
                                                    enable_web_ui_);
   web_prefs.allow_scripts_to_close_windows = true;
   return web_prefs;
 }
 
 SiteInstance* BalloonHost::GetSiteInstance() const {
   return site_instance_.get();
@@ skipping 42 matching lines @@
 }
 
 ViewType::Type BalloonHost::GetRenderViewType() const {
   return ViewType::NOTIFICATION;
 }
 
 RenderViewHostDelegate::View* BalloonHost::GetViewDelegate() {
   return this;
 }
 
-void BalloonHost::ProcessWebUIMessage(
-    const ExtensionHostMsg_DomMessage_Params& params) {
-  if (extension_function_dispatcher_.get()) {
-    extension_function_dispatcher_->HandleRequest(params);
-  }
-}
-
 // RenderViewHostDelegate::View methods implemented to allow links to
 // open pages in new tabs.
 void BalloonHost::CreateNewWindow(
     int route_id,
     const ViewHostMsg_CreateWindow_Params& params) {
   delegate_view_helper_.CreateNewWindow(
       route_id,
       balloon_->profile(),
       site_instance_.get(),
       ChromeWebUIFactory::GetInstance()->GetWebUIType(balloon_->profile(),
@@ skipping 50 matching lines @@
             rvh, this, balloon_->notification().content_url()));
   }
   if (extension_function_dispatcher_.get()) {
     rvh->AllowBindings(BindingsPolicy::EXTENSION);
     rvh->set_is_extension_process(true);
     const Extension* installed_app =
         GetProfile()->GetExtensionService()->GetInstalledApp(
             balloon_->notification().content_url());
     static_cast<BrowserRenderProcessHost*>(rvh->process())->set_installed_app(
         installed_app);
+
+    extension_message_handler_.reset(new ExtensionMessageHandler(
+        rvh->process()->id(), rvh, GetProfile()));
+    extension_message_handler_->set_extension_function_dispatcher(
+        extension_function_dispatcher_.get());
   } else if (enable_web_ui_) {
     rvh->AllowBindings(BindingsPolicy::WEB_UI);
   }
 
   // Do platform-specific initialization.
   render_view_host_ = rvh;
   InitRenderWidgetHostView();
   DCHECK(render_widget_host_view());
 
   rvh->set_view(render_widget_host_view());
@@ skipping 39 matching lines @@
 
 void BalloonHost::NotifyDisconnect() {
   if (!should_notify_on_disconnect_)
     return;
 
   should_notify_on_disconnect_ = false;
   NotificationService::current()->Notify(
       NotificationType::NOTIFY_BALLOON_DISCONNECTED,
       Source<BalloonHost>(this), NotificationService::NoDetails());
 }