[Extensions] Clean up the handling of ExtensionHostMsg_Request

chrome/browser/ui/panels/panel_host.cc

 // Copyright (c) 2012 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/ui/panels/panel_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 22 matching lines @@
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 
 using base::UserMetricsAction;
 
 PanelHost::PanelHost(Panel* panel, Profile* profile)
     : panel_(panel),
       profile_(profile),
-      extension_function_dispatcher_(profile, this),
       weak_factory_(this) {
 }
 
 PanelHost::~PanelHost() {
 }
 
 void PanelHost::Init(const GURL& url) {
   if (url.is_empty())
     return;
 
@@ skipping 10 matching lines @@
   // Needed to give the web contents a Tab ID. Extension APIs
   // expect web contents to have a Tab ID.
   SessionTabHelper::CreateForWebContents(web_contents_.get());
   SessionTabHelper::FromWebContents(web_contents_.get())->SetWindowID(
       panel_->session_id());
 
   favicon::CreateContentFaviconDriverForWebContents(web_contents_.get());
   PrefsTabHelper::CreateForWebContents(web_contents_.get());
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents_.get());
+  extensions::ExtensionWebContentsObserver::GetForWebContents(
+      web_contents_.get())->dispatcher()->set_delegate(this);
 
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
 }
 
 void PanelHost::DestroyWebContents() {
   // Cannot do a web_contents_.reset() because web_contents_.get() will
   // still return the pointer when we CHECK in WebContentsDestroyed (or if
   // we get called back in the middle of web contents destruction, which
   // WebView might do when it detects the web contents is destroyed).
@@ skipping 134 matching lines @@
   // to cleanly unwind.)
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PanelHost::ClosePanel, weak_factory_.GetWeakPtr()));
 }
 
 void PanelHost::ClosePanel() {
   panel_->Close();
 }
 
-bool PanelHost::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(PanelHost, message)
-    IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void PanelHost::OnRequest(const ExtensionHostMsg_Request_Params& params) {
-  if (!web_contents_.get())
-    return;
-
-  extension_function_dispatcher_.Dispatch(params,
-                                          web_contents_->GetRenderViewHost());
-}
-
 extensions::WindowController* PanelHost::GetExtensionWindowController() const {
   return panel_->extension_window_controller();
 }
 
 content::WebContents* PanelHost::GetAssociatedWebContents() const {
   return web_contents_.get();
 }
 
 void PanelHost::Reload() {
   content::RecordAction(UserMetricsAction("Reload"));
   web_contents_->GetController().Reload(true);
 }
 
 void PanelHost::ReloadIgnoringCache() {
   content::RecordAction(UserMetricsAction("ReloadIgnoringCache"));
   web_contents_->GetController().ReloadIgnoringCache(true);
 }
 
 void PanelHost::StopLoading() {
   content::RecordAction(UserMetricsAction("Stop"));
   web_contents_->Stop();
 }
 
 void PanelHost::Zoom(content::PageZoom zoom) {
   ui_zoom::PageZoom::Zoom(web_contents_.get(), zoom);
 }