summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/buffered_resource_handler.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-21 04:29:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-21 04:29:20 +0000
commitd7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a (patch)
tree58b9de096179d94ab1fa05470340709e76cfdf49 /content/browser/loader/buffered_resource_handler.cc
parentec7293192cc51edb8a89f084a165d384f5f82ab9 (diff)
downloadchromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.zip
chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.gz
chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.bz2
Move webplugininfo.h to content/public.
BUG=237249 TBR=scottmg Review URL: https://codereview.chromium.org/19894003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/buffered_resource_handler.cc')
-rw-r--r--content/browser/loader/buffered_resource_handler.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/loader/buffered_resource_handler.cc b/content/browser/loader/buffered_resource_handler.cc
index c31fd80..a3afb3f 100644
--- a/content/browser/loader/buffered_resource_handler.cc
+++ b/content/browser/loader/buffered_resource_handler.cc
@@ -23,13 +23,13 @@
#include "content/public/browser/resource_context.h"
#include "content/public/browser/resource_dispatcher_host_delegate.h"
#include "content/public/common/resource_response.h"
+#include "content/public/common/webplugininfo.h"
#include "net/base/io_buffer.h"
#include "net/base/mime_sniffer.h"
#include "net/base/mime_util.h"
#include "net/base/net_errors.h"
#include "net/http/http_content_disposition.h"
#include "net/http/http_response_headers.h"
-#include "webkit/plugins/webplugininfo.h"
namespace content {
@@ -439,7 +439,7 @@ bool BufferedResourceHandler::HasSupportingPlugin(bool* stale) {
ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request_);
bool allow_wildcard = false;
- webkit::WebPluginInfo plugin;
+ WebPluginInfo plugin;
return PluginServiceImpl::GetInstance()->GetPluginInfo(
info->GetChildID(), info->GetRouteID(), info->GetContext(),
request_->url(), GURL(), response_->head.mime_type, allow_wildcard,
@@ -461,7 +461,7 @@ bool BufferedResourceHandler::CopyReadBufferToNextHandler(int request_id) {
}
void BufferedResourceHandler::OnPluginsLoaded(
- const std::vector<webkit::WebPluginInfo>& plugins) {
+ const std::vector<WebPluginInfo>& plugins) {
bool defer = false;
if (!ProcessResponse(&defer)) {
controller()->Cancel();