diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-14 05:24:44 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-14 05:24:44 +0000 |
| commit | 91d9f3d52a1e55a9938416b258e08d3cc445eae4 (patch) | |
| tree | 41a281011d4ba9e327fb4e167528c99e0faec018 /webkit/tools/test_shell | |
| parent | 3c8f946c38d15238f5b0793123c06859a8bc2352 (diff) | |
| download | chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.zip chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.gz chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.bz2 | |
Make WebPluginInfo more generic
- To account for pepper plugins, it grows a type field
- move WebPluginInfo from webkit::npapi to webkit:: and move the files as well.
This will allow us to remove hacks to get pepper plugins to load soon
BUG=89248
TEST=none
Review URL: http://codereview.chromium.org/7648017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 6 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 46d9184..d4315a7 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -48,7 +48,7 @@ #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/plugins/webplugininfo.h" #include "webkit/tools/test_shell/notification_presenter.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_navigation_controller.h" @@ -684,7 +684,7 @@ bool GetFontTable(int fd, uint32_t table, uint8_t* output, #endif void GetPlugins(bool refresh, - std::vector<webkit::npapi::WebPluginInfo>* plugins) { + std::vector<webkit::WebPluginInfo>* plugins) { if (refresh) webkit::npapi::PluginList::Singleton()->RefreshPlugins(); webkit::npapi::PluginList::Singleton()->GetPlugins(plugins); @@ -696,7 +696,7 @@ void GetPlugins(bool refresh, FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"), }; for (int i = plugins->size() - 1; i >= 0; --i) { - webkit::npapi::WebPluginInfo plugin_info = plugins->at(i); + webkit::WebPluginInfo plugin_info = plugins->at(i); for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) { if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) { webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path); diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 5e9af04..3b107a1 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -593,7 +593,7 @@ WebScreenInfo TestWebViewDelegate::screenInfo() { WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame, const WebPluginParams& params) { bool allow_wildcard = true; - std::vector<webkit::npapi::WebPluginInfo> plugins; + std::vector<webkit::WebPluginInfo> plugins; std::vector<std::string> mime_types; webkit::npapi::PluginList::Singleton()->GetPluginInfoArray( params.url, params.mimeType.utf8(), allow_wildcard, |