diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
| commit | e0e75f67163f77051d8f62d5275dbf40627d5398 (patch) | |
| tree | 070d431dc290d9b9a69c79ceeb94ba7574ef1c31 /chrome/default_plugin/plugin_impl_win.cc | |
| parent | 3370e3b7ee18664a43a9977efeab2166624d0a32 (diff) | |
| download | chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.zip chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.gz chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.bz2 | |
Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5961004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin/plugin_impl_win.cc')
| -rw-r--r-- | chrome/default_plugin/plugin_impl_win.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/default_plugin/plugin_impl_win.cc b/chrome/default_plugin/plugin_impl_win.cc index cb767b0..e9346c6 100644 --- a/chrome/default_plugin/plugin_impl_win.cc +++ b/chrome/default_plugin/plugin_impl_win.cc @@ -15,7 +15,7 @@ #include "grit/webkit_strings.h" #include "unicode/locid.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/plugins/npapi/default_plugin_shared.h" +#include "webkit/glue/plugins/default_plugin_shared.h" static const int TOOLTIP_MAX_WIDTH = 500; @@ -250,8 +250,7 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) { if (plugin_available) { DVLOG(1) << "Plugin available for mime type " << mime_type_; DisplayAvailablePluginStatus(); - NotifyPluginStatus( - webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE); + NotifyPluginStatus(default_plugin::MISSING_PLUGIN_AVAILABLE); } else { DLOG(WARNING) << "No plugin available for mime type " << mime_type_; DisplayStatus(IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG); @@ -261,8 +260,7 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) { int16 PluginInstallerImpl::NPP_HandleEvent(void* event) { NPEvent* npp_event = static_cast<NPEvent*>(event); - if (npp_event->event == - webkit::npapi::default_plugin::kInstallMissingPluginMessage) { + if (npp_event->event == 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) { @@ -529,8 +527,7 @@ LRESULT PluginInstallerImpl::OnLButtonDown(UINT message, WPARAM wparam, return 0; if (plugin_installer_state() == PluginListDownloaded) { ShowInstallDialog(); - NotifyPluginStatus( - webkit::npapi::default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD); + NotifyPluginStatus(default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD); } else if (plugin_installer_state_ == PluginInstallerLaunchSuccess) { DCHECK(default_plugin::g_browser); DCHECK(default_plugin::g_browser->geturl); @@ -645,6 +642,6 @@ void PluginInstallerImpl::NotifyPluginStatus(int status) { default_plugin::g_browser->getvalue( instance_, static_cast<NPNVariable>( - webkit::npapi::default_plugin::kMissingPluginStatusStart + status), + default_plugin::kMissingPluginStatusStart + status), NULL); } |