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 /webkit/glue/webkitclient_impl.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 'webkit/glue/webkitclient_impl.cc')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 844aae7..5346181 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -35,8 +35,8 @@ #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" #include "webkit/glue/media/audio_decoder.h" -#include "webkit/plugins/npapi/plugin_instance.h" -#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/glue/plugins/plugin_instance.h" +#include "webkit/glue/plugins/webplugininfo.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_impl.h" #include "webkit/glue/weburlloader_impl.h" @@ -225,18 +225,18 @@ WebString WebKitClientImpl::userAgent(const WebURL& url) { void WebKitClientImpl::getPluginList(bool refresh, WebPluginListBuilder* builder) { - std::vector<webkit::npapi::WebPluginInfo> plugins; + std::vector<WebPluginInfo> plugins; GetPlugins(refresh, &plugins); for (size_t i = 0; i < plugins.size(); ++i) { - const webkit::npapi::WebPluginInfo& plugin = plugins[i]; + const WebPluginInfo& plugin = plugins[i]; builder->addPlugin( plugin.name, plugin.desc, FilePathStringToWebString(plugin.path.BaseName().value())); for (size_t j = 0; j < plugin.mime_types.size(); ++j) { - const webkit::npapi::WebPluginMimeType& mime_type = plugin.mime_types[j]; + const WebPluginMimeType& mime_type = plugin.mime_types[j]; builder->addMediaTypeToLastPlugin( WebString::fromUTF8(mime_type.mime_type), mime_type.description); |