WIP / Do not commit

chrome/default_plugin/plugin_impl_win.h

Index: chrome/default_plugin/plugin_impl_win.h
diff --git a/chrome/default_plugin/plugin_impl_win.h b/chrome/default_plugin/plugin_impl_win.h
index dc51d12820f0aaa90b56c0d0aa8f7a8e11ad8e9b..945cd8d0add3c5b83a936a28f18ef0c3b02e1e7d 100644
--- a/chrome/default_plugin/plugin_impl_win.h
+++ b/chrome/default_plugin/plugin_impl_win.h
@@ -8,10 +8,11 @@
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
+#include "base/win/process_monitor.h"
 #include "chrome/default_plugin/install_dialog.h"
-#include "chrome/default_plugin/plugin_database_handler.h"
+#include "chrome/browser/plugin_database_handler.h"
 #include "chrome/default_plugin/plugin_installer_base.h"
-#include "chrome/default_plugin/plugin_install_job_monitor.h"
 #include "chrome/default_plugin/plugin_main.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "ui/base/win/window_impl.h"
@@ -38,20 +39,23 @@ class PluginDatabaseHandler;
 // instantiated with the information like the mime type of the
 // target plugin, the display mode, etc.
 class PluginInstallerImpl : public PluginInstallerBase,
+                            public PluginDatabaseHandler::Client,
                             public ui::WindowImpl {
  public:
-  static const int kRefreshPluginsMessage  = WM_APP + 1;
-
   // mode is the plugin instantiation mode, i.e. whether it is a full
   // page plugin (NP_FULL) or an embedded plugin (NP_EMBED)
   explicit PluginInstallerImpl(int16 mode);
   virtual ~PluginInstallerImpl();
 
+  // PluginDatabaseHandler::Client methods:
+  virtual void DownloadPluginList(
+      const std::string& plugin_finder_url) OVERRIDE;
+  virtual void OnPluginListDownloaded() OVERRIDE;
+
   BEGIN_MSG_MAP_EX(PluginInstallerImpl)
     MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackGround)
     MESSAGE_HANDLER(WM_PAINT, OnPaint)
     MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown)
-    MESSAGE_HANDLER(kRefreshPluginsMessage, OnRefreshPlugins)
     MESSAGE_HANDLER(WM_COPYDATA, OnCopyData)
     MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor)
     MESSAGE_HANDLER(
@@ -202,8 +206,7 @@ class PluginInstallerImpl : public PluginInstallerBase,
                                  BOOL& handled);
 
   // Refreshes the loaded plugin list and reloads the current page.
-  LRESULT OnRefreshPlugins(UINT message, WPARAM wparam, LPARAM lparam,
-                           BOOL& handled);
+  void RefreshPlugins();
 
   // Launches the third party plugin installer. This message is
   // received when the request to download the installer, initiated by
@@ -308,8 +311,7 @@ class PluginInstallerImpl : public PluginInstallerBase,
   // which enables the downloaded plugin to be instantiated.
   // The completion events from the job are monitored in an independent
   // thread.
-  scoped_refptr<PluginInstallationJobMonitorThread>
-      installation_job_monitor_thread_;
+  scoped_ptr<base::win::ProcessMonitor> installation_job_monitor_thread_;
   // This object handles download and parsing of the plugins database.
   PluginDatabaseHandler plugin_database_handler_;
   // Indicates if the left click to download/refresh should be enabled or not.