diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 08:25:22 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 08:25:22 +0000 |
commit | 0a0b2542dfeccee7e92bbb30f1b0eea5aec4a936 (patch) | |
tree | f63bbb3f32a44daaa711a998a5285925af3571ca | |
parent | 4ca153033f022dc6e11d6094daed41b1ed0a995f (diff) | |
download | chromium_src-0a0b2542dfeccee7e92bbb30f1b0eea5aec4a936.zip chromium_src-0a0b2542dfeccee7e92bbb30f1b0eea5aec4a936.tar.gz chromium_src-0a0b2542dfeccee7e92bbb30f1b0eea5aec4a936.tar.bz2 |
Remove unused 'in_complete' parameter.
R=jam@chromium.org
Review URL: http://codereview.chromium.org/8947026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116124 0039d316-1c4b-4281-b951-d872f2087c98
8 files changed, 27 insertions, 35 deletions
diff --git a/chrome/browser/download/download_throttling_resource_handler.cc b/chrome/browser/download/download_throttling_resource_handler.cc index a65f984..7f4ba73 100644 --- a/chrome/browser/download/download_throttling_resource_handler.cc +++ b/chrome/browser/download/download_throttling_resource_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -23,8 +23,7 @@ DownloadThrottlingResourceHandler::DownloadThrottlingResourceHandler( const GURL& url, int render_process_host_id, int render_view_id, - int request_id, - bool in_complete) + int request_id) : host_(host), request_(request), url_(url), diff --git a/chrome/browser/download/download_throttling_resource_handler.h b/chrome/browser/download/download_throttling_resource_handler.h index 5e9cba5..d77cbca 100644 --- a/chrome/browser/download/download_throttling_resource_handler.h +++ b/chrome/browser/download/download_throttling_resource_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -37,8 +37,7 @@ class DownloadThrottlingResourceHandler const GURL& url, int render_process_host_id, int render_view_id, - int request_id, - bool in_complete); + int request_id); // ResourceHanlder implementation: virtual bool OnUploadProgress(int request_id, diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index b7426c4..fe8f041 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -196,8 +196,7 @@ ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( int child_id, int route_id, int request_id, - bool is_new_request, - bool in_complete) { + bool is_new_request) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -223,7 +222,7 @@ ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting( return new DownloadThrottlingResourceHandler( handler, resource_dispatcher_host_, download_request_limiter_, request, - request->url(), child_id, route_id, request_id, in_complete); + request->url(), child_id, route_id, request_id); } bool ChromeResourceDispatcherHostDelegate::ShouldDeferStart( diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h index d3a1052..1a4c288 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -56,8 +56,7 @@ class ChromeResourceDispatcherHostDelegate int child_id, int route_id, int request_id, - bool is_new_request, - bool in_complete) OVERRIDE; + bool is_new_request) OVERRIDE; virtual bool ShouldDeferStart( net::URLRequest* request, const content::ResourceContext& resource_context) OVERRIDE; diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc index c6350ad..e1ecc9b 100644 --- a/content/browser/renderer_host/buffered_resource_handler.cc +++ b/content/browser/renderer_host/buffered_resource_handler.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -92,7 +92,7 @@ bool BufferedResourceHandler::OnResponseStarted( content::ResourceResponse* response) { response_ = response; if (!DelayResponse()) - return CompleteResponseStarted(request_id, false); + return CompleteResponseStarted(request_id); return true; } @@ -147,7 +147,7 @@ bool BufferedResourceHandler::OnReadCompleted(int request_id, int* bytes_read) { *bytes_read = bytes_read_; // Done buffering, send the pending ResponseStarted event. - if (!CompleteResponseStarted(request_id, true)) + if (!CompleteResponseStarted(request_id)) return false; // The next handler might have paused the request in OnResponseStarted. @@ -272,8 +272,7 @@ bool BufferedResourceHandler::KeepBuffering(int bytes_read) { return false; } -bool BufferedResourceHandler::CompleteResponseStarted(int request_id, - bool in_complete) { +bool BufferedResourceHandler::CompleteResponseStarted(int request_id) { ResourceDispatcherHostRequestInfo* info = ResourceDispatcherHost::InfoForRequest(request_); std::string mime_type; @@ -338,7 +337,7 @@ bool BufferedResourceHandler::CompleteResponseStarted(int request_id, if (host_->delegate()) { handler = host_->delegate()->DownloadStarting( handler, *info->context(), request_, info->child_id(), - info->route_id(), info->request_id(), false, in_complete); + info->route_id(), info->request_id(), false); } UseAlternateResourceHandler(request_id, handler); @@ -473,6 +472,6 @@ void BufferedResourceHandler::OnPluginsLoaded( ResourceDispatcherHostRequestInfo* info = ResourceDispatcherHost::InfoForRequest(request_); host_->PauseRequest(info->child_id(), info->request_id(), false); - if (!CompleteResponseStarted(info->request_id(), false)) + if (!CompleteResponseStarted(info->request_id())) host_->CancelRequest(info->child_id(), info->request_id(), false); } diff --git a/content/browser/renderer_host/buffered_resource_handler.h b/content/browser/renderer_host/buffered_resource_handler.h index 299e258..3e2f3c1 100644 --- a/content/browser/renderer_host/buffered_resource_handler.h +++ b/content/browser/renderer_host/buffered_resource_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -62,9 +62,8 @@ class BufferedResourceHandler : public ResourceHandler { // Returns true if we have to keep buffering data. bool KeepBuffering(int bytes_read); - // Sends a pending OnResponseStarted notification. |in_complete| is true if - // this is invoked from |OnResponseCompleted|. - bool CompleteResponseStarted(int request_id, bool in_complete); + // Sends a pending OnResponseStarted notification. + bool CompleteResponseStarted(int request_id); // Returns true if we have to wait until the plugin list is generated. bool ShouldWaitForPlugins(); diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index e09aa3e..d4f87b9 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -908,8 +908,7 @@ void ResourceDispatcherHost::BeginDownload( if (delegate_) { handler = delegate_->DownloadStarting( - handler, context, request, child_id, route_id, request_id_, true, - false); + handler, context, request, child_id, route_id, request_id_, true); } if (!request_context->job_factory()->IsHandledURL(url)) { diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h index 4bfeb59..08e1309 100644 --- a/content/public/browser/resource_dispatcher_host_delegate.h +++ b/content/public/browser/resource_dispatcher_host_delegate.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -41,8 +41,8 @@ class ResourceDispatcherHostDelegate { const std::string& method, const GURL& url, ResourceType::Type resource_type, - const content::ResourceContext& resource_context, - const content::Referrer& referrer) = 0; + const ResourceContext& resource_context, + const Referrer& referrer) = 0; // Called after ShouldBeginRequest when all the resource handlers from the // content layer have been added. To add new handlers to the front, return @@ -51,7 +51,7 @@ class ResourceDispatcherHostDelegate { virtual ResourceHandler* RequestBeginning( ResourceHandler* handler, net::URLRequest* request, - const content::ResourceContext& resource_context, + const ResourceContext& resource_context, bool is_subresource, int child_id, int route_id, @@ -65,13 +65,12 @@ class ResourceDispatcherHostDelegate { // |in_complete| is true if this is invoked from |OnResponseCompleted|. virtual ResourceHandler* DownloadStarting( ResourceHandler* handler, - const content::ResourceContext& resource_context, + const ResourceContext& resource_context, net::URLRequest* request, int child_id, int route_id, int request_id, - bool is_new_request, - bool in_complete) = 0; + bool is_new_request) = 0; // Called to determine whether a request's start should be deferred. This // is only called if the ResourceHandler associated with the request does @@ -79,7 +78,7 @@ class ResourceDispatcherHostDelegate { // the request, false will continue the request. virtual bool ShouldDeferStart( net::URLRequest* request, - const content::ResourceContext& resource_context) = 0; + const ResourceContext& resource_context) = 0; // Called when an SSL Client Certificate is requested. If false is returned, // the request is canceled. Otherwise, the certificate is chosen. |