diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
| commit | c85b0ba71b5a55647b01de9d345e46896979033d (patch) | |
| tree | ae99657ca1440b7540da473e1bbe6156e43e9be3 /chrome/browser/plugin_data_remover.cc | |
| parent | 887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff) | |
| download | chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2 | |
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5998002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_data_remover.cc')
| -rw-r--r-- | chrome/browser/plugin_data_remover.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc index fd7d9bd..74aa07c 100644 --- a/chrome/browser/plugin_data_remover.cc +++ b/chrome/browser/plugin_data_remover.cc @@ -10,8 +10,8 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/plugin_service.h" #include "chrome/common/plugin_messages.h" -#include "webkit/plugins/npapi/plugin_group.h" -#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/glue/plugins/plugin_group.h" +#include "webkit/glue/plugins/plugin_list.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" @@ -65,8 +65,7 @@ bool PluginDataRemover::OffTheRecord() { return false; } -void PluginDataRemover::SetPluginInfo( - const webkit::npapi::WebPluginInfo& info) { +void PluginDataRemover::SetPluginInfo(const WebPluginInfo& info) { } void PluginDataRemover::OnChannelOpened(const IPC::ChannelHandle& handle) { @@ -143,16 +142,16 @@ void PluginDataRemover::SignalDone() { bool PluginDataRemover::IsSupported() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); bool allow_wildcard = false; - webkit::npapi::WebPluginInfo plugin; + WebPluginInfo plugin; std::string mime_type; - if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo(GURL(), - g_flash_mime_type, - allow_wildcard, - &plugin, - &mime_type)) + if (!NPAPI::PluginList::Singleton()->GetPluginInfo(GURL(), + g_flash_mime_type, + allow_wildcard, + &plugin, + &mime_type)) return false; scoped_ptr<Version> version( - webkit::npapi::PluginGroup::CreateVersionFromString(plugin.version)); + PluginGroup::CreateVersionFromString(plugin.version)); scoped_ptr<Version> min_version( Version::GetVersionFromString(g_min_flash_version)); return plugin.enabled && |