Moved the following IPC messages used by the chrome NPAPI plugin installer out of content

chrome/default_plugin/plugin_impl_win.cc

 // Copyright (c) 2010 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/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"
 #include "net/base/net_errors.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "unicode/locid.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/default_plugin_shared.h"
 
 static const int TOOLTIP_MAX_WIDTH = 500;
 
+int PluginInstallerImpl::instance_count_ = 0;
+bool PluginInstallerImpl::show_install_infobar_ = true;
+
 PluginInstallerImpl::PluginInstallerImpl(int16 mode)
     : instance_(NULL),
       mode_(mode),
       disable_plugin_finder_(false),
       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),
       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_);
 }
 
 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 PluginProcessHostMsg_GetPluginFinderUrl(&plugin_finder_url_));
+      new ChromePluginProcessHostMsg_GetPluginFinderUrl(&plugin_finder_url_));
   if (plugin_finder_url_.empty())
     disable_plugin_finder_ = true;
 
   InitializeResources(module_handle);
 
   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_);
   } else {
     DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_PLUGIN_FINDER_DISABLED);
   }
-
-  return true;
+  return PluginInstallerBase::Initialize(module_handle, instance, mime_type,
+                                         argc, argn, argv);
 }
 
 void PluginInstallerImpl::Shutdown() {
   if (install_dialog_) {
     install_dialog_->RemoveInstaller(this);
     install_dialog_ = NULL;
   }
 
   if (IsWindow(hwnd())) {
     DestroyWindow(hwnd());
@@ skipping 146 matching lines @@
     } else {
       DLOG(WARNING) << "Failed to download plugin list";
       set_plugin_installer_state(PluginListDownloadFailed);
 
       plugin_database_handler_.Close(true);
     }
 
     if (plugin_available) {
       DVLOG(1) << "Plugin available for mime type " << mime_type_;
       DisplayAvailablePluginStatus();
-      NotifyPluginStatus(
-          webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE);
     } else {
       DLOG(WARNING) << "No plugin available for mime type " << mime_type_;
       DisplayStatus(IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG);
     }
   }
 }
 
 int16 PluginInstallerImpl::NPP_HandleEvent(void* event) {
-  NPEvent* npp_event = static_cast<NPEvent*>(event);
-  if (npp_event->event ==
-          webkit::npapi::default_plugin::kInstallMissingPluginMessage) {
-    // We could get this message because InfoBar may not be in sync with our
-    // internal processing. So we need to check the status.
-    if (plugin_installer_state() == PluginListDownloaded) {
-      ShowInstallDialog();
-    }
-  }
   return 0;
 }
 
 std::wstring PluginInstallerImpl::ReplaceStringForPossibleEmptyReplacement(
     int message_id_with_placeholders,
     int messsage_id_without_placeholders,
     const std::wstring& replacement_string) {
   // If the replacement_string is not empty, load the string identified by
   // the resource id message_id_with_placeholders, and replace the
   // placeholder with the replacement_string. Otherwise return the string
@@ skipping 34 matching lines @@
   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);
 
+  // Show the infobar only once.
+  if (show_install_infobar_) {
+    show_install_infobar_ = false;
+    NotifyPluginStatus(
+        webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE);
+  }
   return true;
 }
 
 void PluginInstallerImpl::DownloadPlugin() {
   set_plugin_installer_state(PluginDownloadInitiated);
 
   DVLOG(1) << "Initiating download for plugin URL "
            << plugin_download_url_.c_str();
 
   DisplayStatus(IDS_DEFAULT_PLUGIN_DOWNLOADING_PLUGIN_MSG);
 
   if (!plugin_download_url_for_display_) {
-    ChildThread::current()->Send(new PluginProcessHostMsg_DownloadUrl(
+    ChildThread::current()->Send(new ChromePluginProcessHostMsg_DownloadUrl(
         plugin_download_url_, hwnd()));
   } else {
     default_plugin::g_browser->geturl(instance(),
                                       plugin_download_url_.c_str(),
                                       "_blank");
     set_plugin_installer_state(PluginInstallerLaunchSuccess);
     DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
     enable_click_ = true;
     RefreshDisplay();
   }
@@ skipping 261 matching lines @@
       installation_job_monitor_thread_->AssignProcessToJob(
           shell_execute_info.hProcess);
       DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
       enable_click_ = true;
       RefreshDisplay();
     }
   }
   return 0;
 }
 
+LRESULT PluginInstallerImpl::OnInstallPluginMessage(UINT message,
+                                                    WPARAM wparam,
+                                                    LPARAM lparam,
+                                                    BOOL& handled) {
+  // We could get this message because InfoBar may not be in sync with our
+  // internal processing. So we need to check the status.
+  if (plugin_installer_state() == PluginListDownloaded) {
+    ShowInstallDialog();
+  }
+  return 0;
+}
+
 bool PluginInstallerImpl::InitializeResources(HINSTANCE module_handle) {
   DCHECK(icon_ == NULL);
   DCHECK(regular_font_ == NULL);
   DCHECK(bold_font_ == NULL);
   DCHECK(underline_font_ == NULL);
 
   icon_ = LoadIcon(module_handle, MAKEINTRESOURCE(IDI_DEFAULT_PLUGIN_ICON));
   DCHECK(icon_ != NULL);
 
   desired_language_ = "en-us";
   regular_font_ = reinterpret_cast<HFONT>(GetStockObject(DEFAULT_GUI_FONT));
   DCHECK(regular_font_ != NULL);
 
   LOGFONT font_info = {0};
   GetObject(regular_font_, sizeof(LOGFONT), &font_info);
   font_info.lfWeight |= FW_BOLD;
   bold_font_ = CreateFontIndirect(&font_info);
   DCHECK(bold_font_ != NULL);
 
   font_info.lfUnderline = TRUE;
   underline_font_ = CreateFontIndirect(&font_info);
   DCHECK(underline_font_ != NULL);
   return true;
 }
 
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
-  default_plugin::g_browser->getvalue(
-      instance_,
-      static_cast<NPNVariable>(
-          webkit::npapi::default_plugin::kMissingPluginStatusStart + status),
-      NULL);
+  ChildThread::current()->Send(
+      new ChromePluginProcessHostMsg_MissingPluginStatus(
+          status,
+          renderer_process_id(),
+          render_view_id(),
+          hwnd()));
 }