summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/download/download_throttling_resource_handler.cc6
-rw-r--r--chrome/browser/download/download_throttling_resource_handler.h6
-rw-r--r--chrome/browser/net/load_timing_observer.cc13
-rw-r--r--chrome/browser/net/load_timing_observer.h8
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc4
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h4
-rw-r--r--chrome/browser/renderer_host/offline_resource_handler.cc14
-rw-r--r--chrome/browser/renderer_host/offline_resource_handler.h4
-rw-r--r--chrome/browser/renderer_host/safe_browsing_resource_handler.cc8
-rw-r--r--chrome/browser/renderer_host/safe_browsing_resource_handler.h6
10 files changed, 39 insertions, 34 deletions
diff --git a/chrome/browser/download/download_throttling_resource_handler.cc b/chrome/browser/download/download_throttling_resource_handler.cc
index 70f26ae..a65f984 100644
--- a/chrome/browser/download/download_throttling_resource_handler.cc
+++ b/chrome/browser/download/download_throttling_resource_handler.cc
@@ -11,7 +11,7 @@
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "content/browser/resource_context.h"
-#include "content/common/resource_response.h"
+#include "content/public/common/resource_response.h"
#include "net/base/io_buffer.h"
#include "net/base/mime_sniffer.h"
@@ -65,7 +65,7 @@ bool DownloadThrottlingResourceHandler::OnUploadProgress(int request_id,
bool DownloadThrottlingResourceHandler::OnRequestRedirected(
int request_id,
const GURL& url,
- ResourceResponse* response,
+ content::ResourceResponse* response,
bool* defer) {
DCHECK(!request_closed_);
if (request_allowed_) {
@@ -77,7 +77,7 @@ bool DownloadThrottlingResourceHandler::OnRequestRedirected(
bool DownloadThrottlingResourceHandler::OnResponseStarted(
int request_id,
- ResourceResponse* response) {
+ content::ResourceResponse* response) {
DCHECK(!request_closed_);
if (request_allowed_)
return next_handler_->OnResponseStarted(request_id, response);
diff --git a/chrome/browser/download/download_throttling_resource_handler.h b/chrome/browser/download/download_throttling_resource_handler.h
index 5c13a16..5e9cba5 100644
--- a/chrome/browser/download/download_throttling_resource_handler.h
+++ b/chrome/browser/download/download_throttling_resource_handler.h
@@ -46,10 +46,10 @@ class DownloadThrottlingResourceHandler
uint64 size) OVERRIDE;
virtual bool OnRequestRedirected(int request_id,
const GURL& url,
- ResourceResponse* response,
+ content::ResourceResponse* response,
bool* defer) OVERRIDE;
virtual bool OnResponseStarted(int request_id,
- ResourceResponse* response) OVERRIDE;
+ content::ResourceResponse* response) OVERRIDE;
virtual bool OnWillStart(int request_id,
const GURL& url,
bool* defer) OVERRIDE;
@@ -87,7 +87,7 @@ class DownloadThrottlingResourceHandler
// Response supplied to OnResponseStarted. Only non-null if OnResponseStarted
// is invoked.
- scoped_refptr<ResourceResponse> response_;
+ scoped_refptr<content::ResourceResponse> response_;
// If we're created by way of BufferedEventHandler we'll get one request for
// a buffer. This is that buffer.
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc
index 58963cb..f0d33e2 100644
--- a/chrome/browser/net/load_timing_observer.cc
+++ b/chrome/browser/net/load_timing_observer.cc
@@ -6,7 +6,7 @@
#include "base/time.h"
#include "chrome/browser/net/chrome_net_log.h"
-#include "content/common/resource_response.h"
+#include "content/public/common/resource_response.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request.h"
@@ -99,8 +99,9 @@ void LoadTimingObserver::OnAddEntry(net::NetLog::EventType type,
}
// static
-void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,
- ResourceResponse* response) {
+void LoadTimingObserver::PopulateTimingInfo(
+ net::URLRequest* request,
+ content::ResourceResponse* response) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (!(request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING))
return;
@@ -115,9 +116,9 @@ void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,
LoadTimingObserver::URLRequestRecord* record =
observer->GetURLRequestRecord(source_id);
if (record) {
- response->response_head.connection_id = record->socket_log_id;
- response->response_head.connection_reused = record->socket_reused;
- response->response_head.load_timing = record->timing;
+ response->connection_id = record->socket_log_id;
+ response->connection_reused = record->socket_reused;
+ response->load_timing = record->timing;
}
}
diff --git a/chrome/browser/net/load_timing_observer.h b/chrome/browser/net/load_timing_observer.h
index 444c3d4..a44a3be 100644
--- a/chrome/browser/net/load_timing_observer.h
+++ b/chrome/browser/net/load_timing_observer.h
@@ -13,12 +13,14 @@
#include "net/base/net_log.h"
#include "webkit/glue/resource_loader_bridge.h"
+namespace content {
+struct ResourceResponse;
+}
+
namespace net {
class URLRequest;
} // namespace net
-struct ResourceResponse;
-
// LoadTimingObserver watches the NetLog event stream and collects the network
// timing information.
//
@@ -72,7 +74,7 @@ class LoadTimingObserver : public ChromeNetLog::ThreadSafeObserverImpl {
net::NetLog::EventParameters* params) OVERRIDE;
static void PopulateTimingInfo(net::URLRequest* request,
- ResourceResponse* response);
+ content::ResourceResponse* response);
private:
FRIEND_TEST_ALL_PREFIXES(LoadTimingObserverTest,
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 0f3a7a8..2ad3a5d 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -306,7 +306,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldForceDownloadResource(
void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
net::URLRequest* request,
- ResourceResponse* response,
+ content::ResourceResponse* response,
ResourceMessageFilter* filter) {
LoadTimingObserver::PopulateTimingInfo(request, response);
@@ -339,7 +339,7 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
net::URLRequest* request,
- ResourceResponse* response,
+ content::ResourceResponse* response,
ResourceMessageFilter* filter) {
LoadTimingObserver::PopulateTimingInfo(request, response);
}
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 6aab52d..0fc5cb6 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
@@ -74,11 +74,11 @@ class ChromeResourceDispatcherHostDelegate
const GURL& url, const std::string& mime_type) OVERRIDE;
virtual void OnResponseStarted(
net::URLRequest* request,
- ResourceResponse* response,
+ content::ResourceResponse* response,
ResourceMessageFilter* filter) OVERRIDE;
virtual void OnRequestRedirected(
net::URLRequest* request,
- ResourceResponse* response,
+ content::ResourceResponse* response,
ResourceMessageFilter* filter) OVERRIDE;
private:
diff --git a/chrome/browser/renderer_host/offline_resource_handler.cc b/chrome/browser/renderer_host/offline_resource_handler.cc
index 66e4cee..536e27cc 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.cc
+++ b/chrome/browser/renderer_host/offline_resource_handler.cc
@@ -54,16 +54,18 @@ bool OfflineResourceHandler::OnUploadProgress(int request_id,
return next_handler_->OnUploadProgress(request_id, position, size);
}
-bool OfflineResourceHandler::OnRequestRedirected(int request_id,
- const GURL& new_url,
- ResourceResponse* response,
- bool* defer) {
+bool OfflineResourceHandler::OnRequestRedirected(
+ int request_id,
+ const GURL& new_url,
+ content::ResourceResponse* response,
+ bool* defer) {
return next_handler_->OnRequestRedirected(
request_id, new_url, response, defer);
}
-bool OfflineResourceHandler::OnResponseStarted(int request_id,
- ResourceResponse* response) {
+bool OfflineResourceHandler::OnResponseStarted(
+ int request_id,
+ content::ResourceResponse* response) {
return next_handler_->OnResponseStarted(request_id, response);
}
diff --git a/chrome/browser/renderer_host/offline_resource_handler.h b/chrome/browser/renderer_host/offline_resource_handler.h
index 2966c0d..b28d5f7 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.h
+++ b/chrome/browser/renderer_host/offline_resource_handler.h
@@ -35,9 +35,9 @@ class OfflineResourceHandler : public ResourceHandler {
virtual bool OnUploadProgress(int request_id, uint64 position,
uint64 size) OVERRIDE;
virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
- ResourceResponse* response, bool* defer) OVERRIDE;
+ content::ResourceResponse* response, bool* defer) OVERRIDE;
virtual bool OnResponseStarted(int request_id,
- ResourceResponse* response) OVERRIDE;
+ content::ResourceResponse* response) OVERRIDE;
virtual bool OnWillStart(int request_id, const GURL& url,
bool* defer) OVERRIDE;
virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
index 97a2bb9..2d97154 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
+++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc
@@ -12,7 +12,7 @@
#include "content/browser/renderer_host/global_request_id.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/browser/renderer_host/resource_message_filter.h"
-#include "content/common/resource_response.h"
+#include "content/public/common/resource_response.h"
#include "net/base/io_buffer.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
@@ -70,7 +70,7 @@ bool SafeBrowsingResourceHandler::OnUploadProgress(int request_id,
bool SafeBrowsingResourceHandler::OnRequestRedirected(
int request_id,
const GURL& new_url,
- ResourceResponse* response,
+ content::ResourceResponse* response,
bool* defer) {
CHECK(state_ == STATE_NONE);
CHECK(defer_state_ == DEFERRED_NONE);
@@ -98,7 +98,7 @@ bool SafeBrowsingResourceHandler::OnRequestRedirected(
}
bool SafeBrowsingResourceHandler::OnResponseStarted(
- int request_id, ResourceResponse* response) {
+ int request_id, content::ResourceResponse* response) {
CHECK(state_ == STATE_NONE);
CHECK(defer_state_ == DEFERRED_NONE);
return next_handler_->OnResponseStarted(request_id, response);
@@ -334,7 +334,7 @@ void SafeBrowsingResourceHandler::ResumeRedirect() {
// Retrieve the details for the paused OnReceivedRedirect().
int request_id = deferred_request_id_;
GURL redirect_url = deferred_url_;
- scoped_refptr<ResourceResponse> redirect_response =
+ scoped_refptr<content::ResourceResponse> redirect_response =
deferred_redirect_response_;
ClearDeferredRequestInfo();
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.h b/chrome/browser/renderer_host/safe_browsing_resource_handler.h
index bc5bdf9..a1a8470 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_handler.h
+++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.h
@@ -54,10 +54,10 @@ class SafeBrowsingResourceHandler : public ResourceHandler,
virtual bool OnUploadProgress(
int request_id, uint64 position, uint64 size) OVERRIDE;
virtual bool OnRequestRedirected(
- int request_id, const GURL& new_url, ResourceResponse* response,
+ int request_id, const GURL& new_url, content::ResourceResponse* response,
bool* defer) OVERRIDE;
virtual bool OnResponseStarted(
- int request_id, ResourceResponse* response) OVERRIDE;
+ int request_id, content::ResourceResponse* response) OVERRIDE;
virtual bool OnWillStart(
int request_id, const GURL& url, bool* defer) OVERRIDE;
virtual bool OnWillRead(
@@ -152,7 +152,7 @@ class SafeBrowsingResourceHandler : public ResourceHandler,
// valid to access these members when defer_state_ != DEFERRED_NONE.
GURL deferred_url_;
int deferred_request_id_;
- scoped_refptr<ResourceResponse> deferred_redirect_response_;
+ scoped_refptr<content::ResourceResponse> deferred_redirect_response_;
scoped_refptr<ResourceHandler> next_handler_;
int render_process_host_id_;
generated by cgit v1.1 at 2025-11-29 10:54:39 +0000