WIP / Do not commit

chrome/default_plugin/plugin_impl_win.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/default_plugin/plugin_impl_win.h"
 
 #include <shellapi.h>
 
+#include "base/bind.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_plugin_messages.h"
 #include "chrome/default_plugin/plugin_main.h"
 #include "content/common/child_thread.h"
 #include "content/common/plugin_messages.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
@@ skipping 15 matching lines @@
       plugin_install_stream_(NULL),
       plugin_installer_state_(PluginInstallerStateUndefined),
       install_dialog_(NULL),
       enable_click_(false),
       icon_(NULL),
       bold_font_(NULL),
       regular_font_(NULL),
       underline_font_(NULL),
       tooltip_(NULL),
       installation_job_monitor_thread_(
-          new PluginInstallationJobMonitorThread()),
-      plugin_database_handler_(*this),
+          new base::win::ProcessMonitor()),
+      plugin_database_handler_(),
       plugin_download_url_for_display_(false) {
   instance_count_++;
 }
 
 PluginInstallerImpl::~PluginInstallerImpl() {
   instance_count_--;
   if (instance_count_ == 0)
     show_install_infobar_ = true;
 
   if (!disable_plugin_finder_)
     installation_job_monitor_thread_->Stop();
 
   if (bold_font_)
     DeleteObject(bold_font_);
 
   if (underline_font_)
     DeleteObject(underline_font_);
 
   if (tooltip_)
     DestroyWindow(tooltip_);
 }
 
+void PluginInstallerImpl::DownloadPluginList(
+    const std::string& plugin_finder_url) {
+  DCHECK(default_plugin::g_browser->geturlnotify);
+  default_plugin::g_browser->geturlnotify(
+      instance(), plugin_finder_url.c_str(), NULL, NULL);
+}
+
+void PluginInstallerImpl::OnPluginListDownloaded() {
+  DVLOG(1) << "Received Done notification for plugin list download";
+  plugin_database_handler_.ParsePluginList();
+  if (plugin_database_handler_.GetPluginDetailsForMimeType(
+          mime_type_.c_str(), desired_language_.c_str(),
+          &plugin_download_url_, &plugin_name_,
+          &plugin_download_url_for_display_)) {
+    install_dialog_ = PluginInstallDialog::AddInstaller(this, plugin_name_);
+    set_plugin_installer_state(PluginListDownloaded);
+  } else {
+    set_plugin_installer_state(PluginListDownloadedPluginNotFound);
+  }
+
+  plugin_database_handler_.Close(false);
+}
+
 bool PluginInstallerImpl::Initialize(HINSTANCE module_handle, NPP instance,
                                      NPMIMEType mime_type, int16 argc,
                                      char* argn[], char* argv[]) {
   DVLOG(1) << __FUNCTION__ << " MIME Type : " << mime_type;
   DCHECK(instance != NULL);
   DCHECK(module_handle != NULL);
 
   if (mime_type == NULL || strlen(mime_type) == 0) {
     NOTREACHED() << __FUNCTION__ << " Invalid parameters passed in";
     return false;
   }
 
   instance_ = instance;
   mime_type_ = mime_type;
 
   ChildThread::current()->Send(
       new ChromePluginProcessHostMsg_GetPluginFinderUrl(&plugin_finder_url_));
   if (plugin_finder_url_.empty())
     disable_plugin_finder_ = true;
 
   InitializeResources(module_handle);
 
   // Set the routing IDs before downloading the plug-in file, so we can
   // immediately notify the browser if a plug-in is available.
   PluginInstallerBase::SetRoutingIds(argc, argn, argv);
   if (!disable_plugin_finder_) {
-    if (!installation_job_monitor_thread_->Initialize()) {
-      NOTREACHED() << "Failed to initialize plugin install job";
-      return false;
-    }
-
     DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_NO_PLUGIN_NAME);
-    plugin_database_handler_.DownloadPluginsFileIfNeeded(plugin_finder_url_);
+    plugin_database_handler_.DownloadPluginsFileIfNeeded(plugin_finder_url_,
+                                                         this);
   } else {
     DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_PLUGIN_FINDER_DISABLED);
   }
   return true;
 }
 
 void PluginInstallerImpl::Shutdown() {
   if (install_dialog_) {
     install_dialog_->RemoveInstaller(this);
     install_dialog_ = NULL;
@@ skipping 126 matching lines @@
       NULL);
   RefreshDisplay();
 }
 
 void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) {
   DCHECK(plugin_installer_state_ == PluginListDownloadInitiated);
 
   if (plugin_installer_state_ == PluginListDownloadInitiated) {
     bool plugin_available = false;
     if (reason == NPRES_DONE) {
-      DVLOG(1) << "Received Done notification for plugin list download";
-      plugin_database_handler_.ParsePluginList();
-      if (plugin_database_handler_.GetPluginDetailsForMimeType(
-              mime_type_.c_str(), desired_language_.c_str(),
-              &plugin_download_url_, &plugin_name_,
-              &plugin_download_url_for_display_)) {
-        plugin_available = true;
-        install_dialog_ = PluginInstallDialog::AddInstaller(this, plugin_name_);
-        set_plugin_installer_state(PluginListDownloaded);
-      } else {
-        set_plugin_installer_state(PluginListDownloadedPluginNotFound);
-      }
-
-      plugin_database_handler_.Close(false);
+      OnPluginListDownloaded();
     } else {
       DLOG(WARNING) << "Failed to download plugin list";
       set_plugin_installer_state(PluginListDownloadFailed);
 
       plugin_database_handler_.Close(true);
     }
 
-    if (plugin_available) {
+    if (plugin_installer_state() == PluginListDownloaded) {
       DVLOG(1) << "Plugin available for mime type " << mime_type_;
       NotifyPluginStatus(
           webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE);
       DisplayAvailablePluginStatus();
     } else {
       DLOG(WARNING) << "No plugin available for mime type " << mime_type_;
       DisplayStatus(IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG);
     }
   }
 }
@@ skipping 38 matching lines @@
     SetWindowPos(hwnd(), NULL, parent_rect.left, parent_rect.top,
                  parent_rect.right - parent_rect.left,
                  parent_rect.bottom - parent_rect.top, SWP_SHOWWINDOW);
     return true;
   }
   // First time in -- no window created by plugin yet.
   GetClientRect(parent_window, &parent_rect);
   set_window_style(WS_CHILD | WS_BORDER);
   Init(parent_window, gfx::Rect(parent_rect));
   DCHECK(IsWindow(hwnd()));
-  installation_job_monitor_thread_->set_plugin_window(hwnd());
 
   CreateToolTip();
   UpdateToolTip();
 
   UpdateWindow(hwnd());
   ShowWindow(hwnd(), SW_SHOW);
 
   if (plugin_installer_state() == PluginListDownloaded) {
     NotifyPluginStatus(
         webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE);
@@ skipping 203 matching lines @@
 
 LRESULT PluginInstallerImpl::OnLButtonDown(UINT message, WPARAM wparam,
                                            LPARAM lparam, BOOL& handled) {
   if (!enable_click_)
     return 0;
   if (plugin_installer_state() == PluginListDownloaded) {
     ShowInstallDialog();
     NotifyPluginStatus(
         webkit::npapi::default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD);
   } else if (plugin_installer_state_ == PluginInstallerLaunchSuccess) {
-    DCHECK(default_plugin::g_browser);
-    DCHECK(default_plugin::g_browser->geturl);
-    default_plugin::g_browser->geturl(
-        instance_,
-        "javascript:navigator.plugins.refresh(true)",
-        "_self");
-    default_plugin::g_browser->geturl(
-        instance_,
-        "javascript:window.location.reload(true)",
-        "_self");
+    RefreshPlugins();
   }
 
   return 0;
 }
 
 LRESULT PluginInstallerImpl::OnSetCursor(UINT message, WPARAM wparam,
                                          LPARAM lparam, BOOL& handled) {
   if (enable_click_) {
     SetCursor(LoadCursor(NULL, MAKEINTRESOURCE(IDC_HAND)));
     return 1;
   }
   handled = FALSE;
   return 0;
 }
 
-LRESULT PluginInstallerImpl::OnRefreshPlugins(UINT message, WPARAM wparam,
-                                              LPARAM lparam, BOOL& handled) {
+void PluginInstallerImpl::RefreshPlugins() {
   DCHECK(default_plugin::g_browser);
   DCHECK(default_plugin::g_browser->geturl);
   default_plugin::g_browser->geturl(
       instance_,
       "javascript:navigator.plugins.refresh(true)",
       "_self");
   default_plugin::g_browser->geturl(
       instance_,
       "javascript:window.location.reload(true)",
       "_self");
-  return 0;
 }
 
 LRESULT PluginInstallerImpl::OnCopyData(UINT message, WPARAM wparam,
                                         LPARAM lparam, BOOL& handled) {
   COPYDATASTRUCT* download_file_info =
       reinterpret_cast<COPYDATASTRUCT*>(lparam);
   if (!download_file_info || !download_file_info->dwData) {
     DLOG(WARNING) << "Failed to download plugin";
     set_plugin_installer_state(PluginDownloadFailed);
     DisplayPluginDownloadFailedStatus();
@@ skipping 16 matching lines @@
     if (!ShellExecuteEx(&shell_execute_info)) {
       DLOG(WARNING) << "Failed to launch plugin installer "
                     << file_path.c_str() << " Error "
                     << ::GetLastError();
       set_plugin_installer_state(PluginInstallerLaunchFailure);
       DisplayStatus(IDS_DEFAULT_PLUGIN_INSTALLATION_FAILED_MSG);
       NOTREACHED();
     } else {
       DVLOG(1) << "Successfully launched plugin installer";
       set_plugin_installer_state(PluginInstallerLaunchSuccess);
-      installation_job_monitor_thread_->AssignProcessToJob(
-          shell_execute_info.hProcess);
+      installation_job_monitor_thread_->Initialize(
+          shell_execute_info.hProcess,
+          base::Bind(&PluginInstallerImpl::RefreshPlugins,
+                     base::Unretained(this)));
       DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
       enable_click_ = true;
       RefreshDisplay();
     }
   }
   return 0;
 }
 
 LRESULT PluginInstallerImpl::OnInstallPluginMessage(UINT message,
                                                     WPARAM wparam,
@@ skipping 42 matching lines @@
   }
 
   ChildThread::current()->Send(
       new ChromePluginProcessHostMsg_MissingPluginStatus(
           status,
           renderer_process_id(),
           render_view_id(),
           hwnd()));
 #endif
 }