Fix two issues with the plugin installer....

webkit/default_plugin/plugin_impl_win.cc

 // Copyright (c) 2006-2009 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 "webkit/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 "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
 #include "webkit/default_plugin/activex_installer.h"
 #include "webkit/activex_shim/activex_shared.h"
 #include "webkit/activex_shim/npn_scripting.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/default_plugin/plugin_main.h"
 #include "webkit/glue/webkit_glue.h"
 
 static const int TOOLTIP_MAX_WIDTH = 500;
 
 PluginInstallerImpl::PluginInstallerImpl(int16 mode)
     : instance_(NULL),
       is_activex_(false),
       mode_(mode),
       plugin_install_stream_(NULL),
       plugin_installer_state_(PluginInstallerStateUndefined),
+      install_dialog_(PluginInstallDialog::AddInstaller(this, plugin_name_)),
       enable_click_(false),
       icon_(NULL),
       bold_font_(NULL),
       regular_font_(NULL),
       underline_font_(NULL),
       tooltip_(NULL),
       activex_installer_(NULL),
       installation_job_monitor_thread_(
           new PluginInstallationJobMonitorThread()),
       plugin_database_handler_(*this),
@@ skipping 68 matching lines @@
     }
   } else {
     DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_NO_PLUGIN_NAME);
     plugin_database_handler_.DownloadPluginsFileIfNeeded(plugin_finder_url_);
   }
 
   return true;
 }
 
 void PluginInstallerImpl::Shutdown() {
-  if (install_dialog_.IsWindow()) {
-    install_dialog_.DestroyWindow();
+  if (install_dialog_) {
+    install_dialog_->RemoveInstaller(this);
+    install_dialog_ = NULL;
   }
+
   if (IsWindow(hwnd())) {
     DestroyWindow(hwnd());
   }
 }
 
 void PluginInstallerImpl::NewStream(NPStream* stream) {
   plugin_install_stream_ = stream;
 }
 
 void PluginInstallerImpl::DestroyStream(NPStream* stream, NPError reason) {
@@ skipping 265 matching lines @@
   return 1;
 }
 
 // Use ICU in order to determine whether the locale is right-to-left.
 //
 // TODO(idana) bug# 1246452: there is already code in
 // app/l10n_util.h/cc that uses ICU to determine the locale direction. We don't
 // currently use this code since code in WebKit should not depend on code in
 // Chrome. We can fix this by pulling (at least part of) the l10n_util
 // functionality up into the Base module.
-bool PluginInstallerImpl::IsRTLLayout() const {
+bool PluginInstallerImpl::IsRTLLayout() {
   const icu::Locale& locale = icu::Locale::getDefault();
   const char* lang = locale.getLanguage();
 
   // Check only for Arabic and Hebrew languages for now.
   if (strcmp(lang, "ar") == 0 || strcmp(lang, "he") == 0) {
     return true;
   }
   return false;
 }
 
@@ skipping 129 matching lines @@
     text_rect.bottom = text_rect.top + device_point.y;
 
     DrawText(paint_dc, optional_additional_message_.c_str(),
              static_cast<int>(optional_additional_message_.length()),
              &text_rect, DT_CENTER | DT_VCENTER | additional_dt_flags);
   }
 }
 
 void PluginInstallerImpl::ShowInstallDialog() {
   enable_click_ = false;
-  install_dialog_.Initialize(this, plugin_name_);
-  install_dialog_.Create(hwnd(), NULL);
-  install_dialog_.ShowWindow(SW_SHOW);
+  install_dialog_->ShowInstallDialog();
 }
 
 LRESULT PluginInstallerImpl::OnLButtonDown(UINT message, WPARAM wparam,
                                            LPARAM lparam, BOOL& handled) {
   if (!enable_click_)
     return 0;
   if (plugin_installer_state() == PluginListDownloaded) {
     ShowInstallDialog();
     NotifyPluginStatus(default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD);
   } else if (plugin_installer_state_ == PluginInstallerLaunchSuccess) {
@@ skipping 206 matching lines @@
   return true;
 }
 
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
   default_plugin::g_browser->getvalue(
     instance_,
     static_cast<NPNVariable>(
         default_plugin::kMissingPluginStatusStart + status),
     NULL);
 }