summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-14 22:07:45 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-14 22:07:45 +0000
commitf48013bebb181256b28ba44ddcb0e49973c5d1d3 (patch)
treee33e1f26cf05eb4b77a3eb37c6db9947cceb4861 /chrome
parent21ecbd95babcce57bbf45bf13c7f5c190c4b2a80 (diff)
downloadchromium_src-f48013bebb181256b28ba44ddcb0e49973c5d1d3.zip
chromium_src-f48013bebb181256b28ba44ddcb0e49973c5d1d3.tar.gz
chromium_src-f48013bebb181256b28ba44ddcb0e49973c5d1d3.tar.bz2
Enable setting of wasFetchedViaSpdy flag through browser/renderer.
BUG=none TEST=needed Review URL: http://codereview.chromium.org/549032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/render_view.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 7cc1173..f59d538 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2463,10 +2463,6 @@ void RenderView::willSendRequest(
void RenderView::didReceiveResponse(
WebFrame* frame, unsigned identifier, const WebURLResponse& response) {
- // Consider loading an alternate error page for 404 responses.
- if (response.httpStatusCode() != 404)
- return;
-
// Only do this for responses that correspond to a provisional data source
// of the top-most frame. If we have a provisional data source, then we
// can't have any sub-resources yet, so we know that this response must
@@ -2479,6 +2475,17 @@ void RenderView::didReceiveResponse(
if (frame->isViewSourceModeEnabled())
return;
+ // Record that this was a page loaded over SPDY.
+ if (response.wasFetchedViaSPDY()) {
+ NavigationState* navigation_state =
+ NavigationState::FromDataSource(frame->provisionalDataSource());
+ navigation_state->set_was_fetched_via_spdy(true);
+ }
+
+ // Consider loading an alternate error page for 404 responses.
+ if (response.httpStatusCode() != 404)
+ return;
+
// Can we even load an alternate error page for this URL?
if (!GetAlternateErrorPageURL(response.url(), HTTP_404).is_valid())
return;