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

Unified Diff: content/browser/renderer_host/resource_request_info_impl.cc

Issue 10501004: Refactor the guts of ResourceDispatcherHostImpl into a new class named (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/resource_request_info_impl.cc
===================================================================
--- content/browser/renderer_host/resource_request_info_impl.cc (revision 141889)
+++ content/browser/renderer_host/resource_request_info_impl.cc (working copy)
@@ -4,11 +4,9 @@
#include "content/browser/renderer_host/resource_request_info_impl.h"
-#include "content/browser/renderer_host/doomed_resource_handler.h"
-#include "content/browser/ssl/ssl_client_auth_handler.h"
#include "content/browser/worker_host/worker_service_impl.h"
#include "content/common/net/url_request_user_data.h"
-#include "content/public/browser/resource_dispatcher_host_login_delegate.h"
+#include "content/public/browser/global_request_id.h"
#include "net/url_request/url_request.h"
#include "webkit/blob/blob_data.h"
@@ -30,7 +28,6 @@
ResourceContext* context) {
ResourceRequestInfoImpl* info =
new ResourceRequestInfoImpl(
- scoped_ptr<ResourceHandler>(), // handler
PROCESS_TYPE_RENDERER, // process_type
-1, // child_id
MSG_ROUTING_NONE, // route_id
@@ -81,7 +78,6 @@
}
ResourceRequestInfoImpl::ResourceRequestInfoImpl(
- scoped_ptr<ResourceHandler> handler,
ProcessType process_type,
int child_id,
int route_id,
@@ -99,8 +95,7 @@
bool has_user_gesture,
WebKit::WebReferrerPolicy referrer_policy,
ResourceContext* context)
- : resource_handler_(handler.Pass()),
- cross_site_handler_(NULL),
+ : cross_site_handler_(NULL),
process_type_(process_type),
child_id_(child_id),
route_id_(route_id),
@@ -114,25 +109,15 @@
is_download_(is_download),
allow_download_(allow_download),
has_user_gesture_(has_user_gesture),
- pause_count_(0),
resource_type_(resource_type),
transition_type_(transition_type),
upload_size_(upload_size),
- last_upload_position_(0),
- waiting_for_upload_progress_ack_(false),
memory_cost_(0),
referrer_policy_(referrer_policy),
- context_(context),
- is_paused_(false),
- called_on_response_started_(false),
- has_started_reading_(false),
- paused_read_bytes_(0) {
+ context_(context) {
}
ResourceRequestInfoImpl::~ResourceRequestInfoImpl() {
- // Run ResourceHandler destructor before we tear-down the rest of our state
- // as the ResourceHandler may want to inspect some of our other members.
- resource_handler_.reset();
}
ResourceContext* ResourceRequestInfoImpl::GetContext() const {
@@ -215,21 +200,10 @@
}
}
-void ResourceRequestInfoImpl::InsertDoomedResourceHandler() {
- resource_handler_.reset(
- new DoomedResourceHandler(resource_handler_.Pass()));
+GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const {
+ return GlobalRequestID(child_id_, request_id_);
}
-void ResourceRequestInfoImpl::set_login_delegate(
- ResourceDispatcherHostLoginDelegate* ld) {
- login_delegate_ = ld;
-}
-
-void ResourceRequestInfoImpl::set_ssl_client_auth_handler(
- SSLClientAuthHandler* s) {
- ssl_client_auth_handler_ = s;
-}
-
void ResourceRequestInfoImpl::set_requested_blob_data(
webkit_blob::BlobData* data) {
requested_blob_data_ = data;

Powered by Google App Engine
This is Rietveld 408576698