summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2015-11-23 14:46:55 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-23 22:47:36 +0000
commite7325fc3acb3de298d65726950c4e040b7ac9ab4 (patch)
treee4348ff3d217a1e5e4011ff856be8e3ddf4faab0 /content/browser
parent4d2080079417529d000f3ed13f144ba0b4a08a86 (diff)
downloadchromium_src-e7325fc3acb3de298d65726950c4e040b7ac9ab4.zip
chromium_src-e7325fc3acb3de298d65726950c4e040b7ac9ab4.tar.gz
chromium_src-e7325fc3acb3de298d65726950c4e040b7ac9ab4.tar.bz2
Unexpose ResourceRequestInfo::GetRequestID.
This is never used outside of //content. BUG=376003 Review URL: https://codereview.chromium.org/1463013003 Cr-Commit-Position: refs/heads/master@{#361206}
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/download/download_resource_handler.cc4
-rw-r--r--content/browser/loader/resource_dispatcher_host_impl.cc6
-rw-r--r--content/browser/loader/resource_request_info_impl.cc8
-rw-r--r--content/browser/loader/resource_request_info_impl.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/content/browser/download/download_resource_handler.cc b/content/browser/download/download_resource_handler.cc
index d806d94..2b6ac35 100644
--- a/content/browser/download/download_resource_handler.cc
+++ b/content/browser/download/download_resource_handler.cc
@@ -499,7 +499,7 @@ void DownloadResourceHandler::ResumeRequest() {
void DownloadResourceHandler::CancelRequest() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- const ResourceRequestInfo* info = GetRequestInfo();
+ const ResourceRequestInfoImpl* info = GetRequestInfo();
ResourceDispatcherHostImpl::Get()->CancelRequest(
info->GetChildID(),
info->GetRequestID());
@@ -507,7 +507,7 @@ void DownloadResourceHandler::CancelRequest() {
}
std::string DownloadResourceHandler::DebugString() const {
- const ResourceRequestInfo* info = GetRequestInfo();
+ const ResourceRequestInfoImpl* info = GetRequestInfo();
return base::StringPrintf("{"
" url_ = " "\"%s\""
" info = {"
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 391a6b4..f4b5fac 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -730,8 +730,8 @@ ResourceDispatcherHostImpl::CreateResourceHandlerForDownload(
scoped_ptr<ResourceHandler> handler(
new DownloadResourceHandler(id, request, started_cb, save_info.Pass()));
if (delegate_) {
- const ResourceRequestInfo* request_info(
- ResourceRequestInfo::ForRequest(request));
+ const ResourceRequestInfoImpl* request_info(
+ ResourceRequestInfoImpl::ForRequest(request));
ScopedVector<ResourceThrottle> throttles;
delegate_->DownloadStarting(
@@ -884,7 +884,7 @@ void ResourceDispatcherHostImpl::DidReceiveResponse(ResourceLoader* loader) {
}
void ResourceDispatcherHostImpl::DidFinishLoading(ResourceLoader* loader) {
- ResourceRequestInfo* info = loader->GetRequestInfo();
+ ResourceRequestInfoImpl* info = loader->GetRequestInfo();
// Record final result of all resource loads.
if (info->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME) {
diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
index 26f99f9..6ed5993 100644
--- a/content/browser/loader/resource_request_info_impl.cc
+++ b/content/browser/loader/resource_request_info_impl.cc
@@ -184,10 +184,6 @@ int ResourceRequestInfoImpl::GetOriginPID() const {
return origin_pid_;
}
-int ResourceRequestInfoImpl::GetRequestID() const {
- return request_id_;
-}
-
int ResourceRequestInfoImpl::GetRenderFrameID() const {
return render_frame_id_;
}
@@ -273,6 +269,10 @@ void ResourceRequestInfoImpl::AssociateWithRequest(net::URLRequest* request) {
}
}
+int ResourceRequestInfoImpl::GetRequestID() const {
+ return request_id_;
+}
+
GlobalRequestID ResourceRequestInfoImpl::GetGlobalRequestID() const {
return GlobalRequestID(child_id_, request_id_);
}
diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h
index 40a597a..774668a 100644
--- a/content/browser/loader/resource_request_info_impl.h
+++ b/content/browser/loader/resource_request_info_impl.h
@@ -74,7 +74,6 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
int GetChildID() const override;
int GetRouteID() const override;
int GetOriginPID() const override;
- int GetRequestID() const override;
int GetRenderFrameID() const override;
bool IsMainFrame() const override;
bool ParentIsMainFrame() const override;
@@ -95,6 +94,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
CONTENT_EXPORT void AssociateWithRequest(net::URLRequest* request);
+ CONTENT_EXPORT int GetRequestID() const;
CONTENT_EXPORT GlobalRequestID GetGlobalRequestID() const;
GlobalRoutingID GetGlobalRoutingID() const;