diff options
Diffstat (limited to 'webkit/support/webkit_support_glue.cc')
| -rw-r--r-- | webkit/support/webkit_support_glue.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc index 2308a40..85d09db 100644 --- a/webkit/support/webkit_support_glue.cc +++ b/webkit/support/webkit_support_glue.cc @@ -7,14 +7,15 @@ #include "base/base_paths.h" #include "base/path_service.h" #include "googleurl/src/gurl.h" -#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/plugins/npapi/plugin_list.h" // Functions needed by webkit_glue. namespace webkit_glue { -void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { - NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); +void GetPlugins(bool refresh, + std::vector<webkit::npapi::WebPluginInfo>* plugins) { + webkit::npapi::PluginList::Singleton()->GetPlugins(refresh, plugins); // Don't load the forked npapi_layout_test_plugin in DRT, we only want to // use the upstream version TestNetscapePlugIn (on Mac, the upstream version // is named WebKitTestNetscapePlugIn). @@ -24,10 +25,10 @@ void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { - WebPluginInfo plugin_info = plugins->at(i); + webkit::npapi::WebPluginInfo plugin_info = plugins->at(i); for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { - NPAPI::PluginList::Singleton()->DisablePlugin(plugin_info.path); + webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); plugins->erase(plugins->begin() + i); } } |