From b6badfa6a538f889025db775662fe61fcb45dc37 Mon Sep 17 00:00:00 2001 From: "chase@chromium.org" Date: Mon, 20 Dec 2010 23:42:40 +0000 Subject: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" Manually reverting r69766, which was itself a failed revert of r69755. BUG=none TEST=none TBR=dmaclach@chromium.org Review URL: http://codereview.chromium.org/5996003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/default_plugin/DEPS | 1 + chrome/default_plugin/plugin_impl_gtk.cc | 4 ++-- chrome/default_plugin/plugin_impl_mac.mm | 4 ++-- chrome/default_plugin/plugin_impl_win.cc | 13 ++++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) (limited to 'chrome/default_plugin') diff --git a/chrome/default_plugin/DEPS b/chrome/default_plugin/DEPS index 6e518f99..0ba7c46 100644 --- a/chrome/default_plugin/DEPS +++ b/chrome/default_plugin/DEPS @@ -3,4 +3,5 @@ include_rules = [ "+grit", # For generated headers "+libxml", "+webkit/glue", + "+webkit/plugins", ] diff --git a/chrome/default_plugin/plugin_impl_gtk.cc b/chrome/default_plugin/plugin_impl_gtk.cc index ae7dfb2..b6dc38a 100644 --- a/chrome/default_plugin/plugin_impl_gtk.cc +++ b/chrome/default_plugin/plugin_impl_gtk.cc @@ -14,7 +14,7 @@ #include "grit/webkit_strings.h" #include "unicode/locid.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/plugins/default_plugin_shared.h" +#include "webkit/plugins/npapi/default_plugin_shared.h" // TODO(thakis): Most methods in this class are stubbed out an need to be // implemented. @@ -137,6 +137,6 @@ void PluginInstallerImpl::NotifyPluginStatus(int status) { default_plugin::g_browser->getvalue( instance_, static_cast( - default_plugin::kMissingPluginStatusStart + status), + webkit::npapi::default_plugin::kMissingPluginStatusStart + status), NULL); } diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm index 0bad41b..f964023 100644 --- a/chrome/default_plugin/plugin_impl_mac.mm +++ b/chrome/default_plugin/plugin_impl_mac.mm @@ -17,7 +17,7 @@ #include "grit/webkit_strings.h" #include "unicode/locid.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/plugins/default_plugin_shared.h" +#include "webkit/plugins/npapi/default_plugin_shared.h" // TODO(thakis): Most methods in this class are stubbed out and need to be // implemented. @@ -194,6 +194,6 @@ void PluginInstallerImpl::NotifyPluginStatus(int status) { default_plugin::g_browser->getvalue( instance_, static_cast( - default_plugin::kMissingPluginStatusStart + status), + webkit::npapi::default_plugin::kMissingPluginStatusStart + status), NULL); } diff --git a/chrome/default_plugin/plugin_impl_win.cc b/chrome/default_plugin/plugin_impl_win.cc index e9346c6..cb767b0 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/glue/plugins/default_plugin_shared.h" +#include "webkit/plugins/npapi/default_plugin_shared.h" static const int TOOLTIP_MAX_WIDTH = 500; @@ -250,7 +250,8 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) { if (plugin_available) { DVLOG(1) << "Plugin available for mime type " << mime_type_; DisplayAvailablePluginStatus(); - NotifyPluginStatus(default_plugin::MISSING_PLUGIN_AVAILABLE); + NotifyPluginStatus( + webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE); } else { DLOG(WARNING) << "No plugin available for mime type " << mime_type_; DisplayStatus(IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG); @@ -260,7 +261,8 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) { int16 PluginInstallerImpl::NPP_HandleEvent(void* event) { NPEvent* npp_event = static_cast(event); - if (npp_event->event == default_plugin::kInstallMissingPluginMessage) { + if (npp_event->event == + webkit::npapi::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) { @@ -527,7 +529,8 @@ LRESULT PluginInstallerImpl::OnLButtonDown(UINT message, WPARAM wparam, return 0; if (plugin_installer_state() == PluginListDownloaded) { ShowInstallDialog(); - NotifyPluginStatus(default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD); + NotifyPluginStatus( + webkit::npapi::default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD); } else if (plugin_installer_state_ == PluginInstallerLaunchSuccess) { DCHECK(default_plugin::g_browser); DCHECK(default_plugin::g_browser->geturl); @@ -642,6 +645,6 @@ void PluginInstallerImpl::NotifyPluginStatus(int status) { default_plugin::g_browser->getvalue( instance_, static_cast( - default_plugin::kMissingPluginStatusStart + status), + webkit::npapi::default_plugin::kMissingPluginStatusStart + status), NULL); } -- cgit v1.1