Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1229)

Side by Side Diff: content/browser/renderer_host/buffered_resource_handler.cc

Issue 8346017: Move content_browser_client.h to public, and while at it, move (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed a file post merge. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/buffered_resource_handler.h" 5 #include "content/browser/renderer_host/buffered_resource_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "content/browser/browser_thread.h" 13 #include "content/browser/browser_thread.h"
14 #include "content/browser/content_browser_client.h"
15 #include "content/browser/download/download_resource_handler.h" 14 #include "content/browser/download/download_resource_handler.h"
16 #include "content/browser/plugin_service.h" 15 #include "content/browser/plugin_service.h"
17 #include "content/browser/renderer_host/resource_dispatcher_host.h" 16 #include "content/browser/renderer_host/resource_dispatcher_host.h"
18 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h" 17 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
19 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" 18 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
20 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h" 19 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h"
21 #include "content/browser/resource_context.h" 20 #include "content/browser/resource_context.h"
22 #include "content/common/resource_response.h" 21 #include "content/common/resource_response.h"
22 #include "content/public/browser/content_browser_client.h"
23 #include "net/base/io_buffer.h" 23 #include "net/base/io_buffer.h"
24 #include "net/base/mime_sniffer.h" 24 #include "net/base/mime_sniffer.h"
25 #include "net/base/mime_util.h" 25 #include "net/base/mime_util.h"
26 #include "net/base/net_errors.h" 26 #include "net/base/net_errors.h"
27 #include "net/http/http_response_headers.h" 27 #include "net/http/http_response_headers.h"
28 #include "webkit/plugins/webplugininfo.h" 28 #include "webkit/plugins/webplugininfo.h"
29 29
30 namespace { 30 namespace {
31 31
32 void RecordSnifferMetrics(bool sniffing_blocked, 32 void RecordSnifferMetrics(bool sniffing_blocked,
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 wait_for_plugins_ = false; 466 wait_for_plugins_ = false;
467 if (!request_) 467 if (!request_)
468 return; 468 return;
469 469
470 ResourceDispatcherHostRequestInfo* info = 470 ResourceDispatcherHostRequestInfo* info =
471 ResourceDispatcherHost::InfoForRequest(request_); 471 ResourceDispatcherHost::InfoForRequest(request_);
472 host_->PauseRequest(info->child_id(), info->request_id(), false); 472 host_->PauseRequest(info->child_id(), info->request_id(), false);
473 if (!CompleteResponseStarted(info->request_id(), false)) 473 if (!CompleteResponseStarted(info->request_id(), false))
474 host_->CancelRequest(info->child_id(), info->request_id(), false); 474 host_->CancelRequest(info->child_id(), info->request_id(), false);
475 } 475 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698