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

Unified Diff: webkit/default_plugin/plugin_impl_win.cc

Issue 179051: Fix two issues with the plugin installer.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 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/plugin_impl_win.h ('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 24950)
+++ webkit/default_plugin/plugin_impl_win.cc (working copy)
@@ -27,6 +27,7 @@
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),
@@ -115,9 +116,11 @@
}
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());
}
@@ -403,7 +406,7 @@
// 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();
@@ -553,9 +556,7 @@
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,
« no previous file with comments | « webkit/default_plugin/plugin_impl_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698