More refactoring of PluginProcessHost

chrome/browser/plugin_process_host.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_
 #define CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/id_map.h"
 #include "base/object_watcher.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/child_process_info.h"
-#include "chrome/common/ipc_channel_proxy.h"
+#include "chrome/common/ipc_channel.h"
 #include "webkit/glue/webplugin.h"
 
-class PluginService;
-class PluginProcessHost;
 class ResourceDispatcherHost;
 class URLRequestContext;
 struct ViewHostMsg_Resource_Request;
 class GURL;
 
 // Represents the browser side of the browser <--> plugin communication
 // channel.  Different plugins run in their own process, but multiple instances
 // of the same plugin run in the same process.  There will be one
 // PluginProcessHost per plugin process, matched with a corresponding
 // PluginProcess running in the plugin process.  The browser is responsible for
 // starting the plugin process when a plugin is created that doesn't already
 // have a process.  After that, most of the communication is directly between
 // the renderer and plugin processes.
 class PluginProcessHost : public ChildProcessInfo,
                           public IPC::Channel::Listener,
                           public IPC::Message::Sender,
                           public base::ObjectWatcher::Delegate,
                           public ResolveProxyMsgHelper::Delegate {
  public:
-  PluginProcessHost(PluginService* plugin_service);
+  PluginProcessHost();
   ~PluginProcessHost();
 
   // Initialize the new plugin process, returning true on success. This must
   // be called before the object can be used. If plugin_path is the
   // ActiveX-shim, then activex_clsid is the class id of ActiveX control,
   // otherwise activex_clsid is ignored.
   bool Init(const WebPluginInfo& info,
             const std::string& activex_clsid,
             const std::wstring& locale);
 
@@ skipping 29 matching lines @@
 
   // This function is called on the IO thread once we receive a reply from the
   // modal HTML dialog (in the form of a JSON string). This function forwards
   // that reply back to the plugin that requested the dialog.
   void OnModalDialogResponse(const std::string& json_retval,
                              IPC::Message* sync_result);
 
   // Shuts down the current plugin process instance.
   void Shutdown();
 
+  const WebPluginInfo& info() const { return info_; }
+
  private:
   friend class PluginResolveProxyHelper;
 
   // Sends a message to the plugin process to request creation of a new channel
   // for the given mime type.
   void RequestPluginChannel(ResourceMessageFilter* renderer_message_filter,
                             const std::string& mime_type,
                             IPC::Message* reply_msg);
   // Message handlers.
   void OnChannelCreated(int process_id, const std::wstring& channel_name);
@@ skipping 44 matching lines @@
 
   // The IPC::Channel.
   scoped_ptr<IPC::Channel> channel_;
 
   // IPC Channel's id.
   std::wstring channel_id_;
 
   // Information about the plugin.
   WebPluginInfo info_;
 
-  PluginService* plugin_service_;
-
-  ResourceDispatcherHost* resource_dispatcher_host_;
-
   // Helper class for handling PluginProcessHost_ResolveProxy messages (manages
   // the requests to the proxy service).
   ResolveProxyMsgHelper resolve_proxy_msg_helper_;
 
   DISALLOW_EVIL_CONSTRUCTORS(PluginProcessHost);
 };
 
 #endif  // CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_