Show missing plug-in infobar only if a plug-in is available.

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"
@@ skipping 69 matching lines @@
   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_);
   } else {
     DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_PLUGIN_FINDER_DISABLED);
   }
-  return PluginInstallerBase::Initialize(module_handle, instance, mime_type,
-                                         argc, argn, argv);
+  return true;
 }
 
 void PluginInstallerImpl::Shutdown() {
   if (install_dialog_) {
     install_dialog_->RemoveInstaller(this);
     install_dialog_ = NULL;
   }
 
   if (IsWindow(hwnd())) {
     DestroyWindow(hwnd());
@@ skipping 145 matching lines @@
       plugin_database_handler_.Close(false);
     } 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_;
+      // Show the infobar only once.
+      if (show_install_infobar_) {
+        show_install_infobar_ = false;
+        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);
     }
   }
 }
 
 int16 PluginInstallerImpl::NPP_HandleEvent(void* event) {
   return 0;
@@ skipping 43 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);
@@ skipping 323 matching lines @@
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
 #if !defined(USE_AURA)
   ChildThread::current()->Send(
       new ChromePluginProcessHostMsg_MissingPluginStatus(
           status,
           renderer_process_id(),
           render_view_id(),
           hwnd()));
 #endif
 }