Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: webkit/default_plugin/plugin_impl_win.cc

Issue 196035: This fixes a regression with my previous fix for the installer dialog. The p... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/default_plugin/install_dialog.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/default_plugin/plugin_impl_win.cc
===================================================================
--- webkit/default_plugin/plugin_impl_win.cc (revision 25432)
+++ webkit/default_plugin/plugin_impl_win.cc (working copy)
@@ -27,7 +27,7 @@
mode_(mode),
plugin_install_stream_(NULL),
plugin_installer_state_(PluginInstallerStateUndefined),
- install_dialog_(PluginInstallDialog::AddInstaller(this, plugin_name_)),
+ install_dialog_(NULL),
enable_click_(false),
icon_(NULL),
bold_font_(NULL),
@@ -256,13 +256,14 @@
bool plugin_available = false;
if (reason == NPRES_DONE) {
DLOG(INFO) << "Received Done notification for plugin list download";
- set_plugin_installer_state(PluginListDownloaded);
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);
}
@@ -556,7 +557,7 @@
void PluginInstallerImpl::ShowInstallDialog() {
enable_click_ = false;
- install_dialog_->ShowInstallDialog();
+ install_dialog_->ShowInstallDialog(hwnd());
}
LRESULT PluginInstallerImpl::OnLButtonDown(UINT message, WPARAM wparam,
« no previous file with comments | « webkit/default_plugin/install_dialog.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698