summaryrefslogtreecommitdiffstats
path: root/webkit/glue/weburlloader_impl.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 11:33:16 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 11:33:16 +0000
commit54e981d2ed56b5becca0dcbd6d2f13503f0bfc01 (patch)
treed51bc727330a4f901794b3bec8657c138d4d72b6 /webkit/glue/weburlloader_impl.cc
parentf681c78a89e758ff1255708569fd6562af28b574 (diff)
downloadchromium_src-54e981d2ed56b5becca0dcbd6d2f13503f0bfc01.zip
chromium_src-54e981d2ed56b5becca0dcbd6d2f13503f0bfc01.tar.gz
chromium_src-54e981d2ed56b5becca0dcbd6d2f13503f0bfc01.tar.bz2
DevTools: provide response code and status text as a part of raw headers data.
BUG=44867 TEST= Review URL: http://codereview.chromium.org/5106002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/weburlloader_impl.cc')
-rw-r--r--webkit/glue/weburlloader_impl.cc18
1 files changed, 11 insertions, 7 deletions
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 9f7c325..a7f219d 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -18,7 +18,7 @@
#include "net/base/net_util.h"
#include "net/http/http_response_headers.h"
#include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebResourceRawHeaders.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebHTTPLoadInfo.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
@@ -37,7 +37,7 @@ using base::TimeDelta;
using WebKit::WebData;
using WebKit::WebHTTPBody;
using WebKit::WebHTTPHeaderVisitor;
-using WebKit::WebResourceRawHeaders;
+using WebKit::WebHTTPLoadInfo;
using WebKit::WebSecurityPolicy;
using WebKit::WebString;
using WebKit::WebURL;
@@ -208,22 +208,26 @@ void PopulateURLResponse(
response->setLoadTiming(timing);
if (info.devtools_info.get()) {
- WebResourceRawHeaders rawHeaders;
+ WebHTTPLoadInfo load_info;
+
+ load_info.setHTTPStatusCode(info.devtools_info->http_status_code);
+ load_info.setHTTPStatusText(WebString::fromUTF8(
+ info.devtools_info->http_status_text));
const HeadersVector& request_headers = info.devtools_info->request_headers;
- for (HeadersVector::const_iterator it = request_headers .begin();
+ for (HeadersVector::const_iterator it = request_headers.begin();
it != request_headers.end(); ++it) {
- rawHeaders.addRequestHeader(WebString::fromUTF8(it->first),
+ load_info.addRequestHeader(WebString::fromUTF8(it->first),
WebString::fromUTF8(it->second));
}
const HeadersVector& response_headers =
info.devtools_info->response_headers;
for (HeadersVector::const_iterator it = response_headers.begin();
it != response_headers.end(); ++it) {
- rawHeaders.addResponseHeader(WebString::fromUTF8(it->first),
+ load_info.addResponseHeader(WebString::fromUTF8(it->first),
WebString::fromUTF8(it->second));
}
- response->setResourceRawHeaders(rawHeaders);
+ response->setHTTPLoadInfo(load_info);
}
const net::HttpResponseHeaders* headers = info.headers;