Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 90e3b774554884375faa7e7cbdf99e268c6a2c61..5c6407354c6367f641e7fd6b1f1e286b585cca90 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -3600,14 +3600,24 @@ void RenderFrameImpl::didCommitProvisionalLoad( |
| DocumentState::FromDataSource(frame->dataSource()); |
| NavigationStateImpl* navigation_state = |
| static_cast<NavigationStateImpl*>(document_state->navigation_state()); |
| + const WebURLResponse& web_url_response = frame->dataSource()->response(); |
| WebURLResponseExtraDataImpl* extra_data = |
| - GetExtraDataFromResponse(frame->dataSource()->response()); |
| + GetExtraDataFromResponse(web_url_response); |
| // Only update the PreviewsState and effective connection type states for new |
| // main frame documents. Subframes inherit from the main frame and should not |
| // change at commit time. |
| if (is_main_frame_ && !navigation_state->WasWithinSamePage()) { |
| previews_state_ = |
| extra_data ? extra_data->previews_state() : PREVIEWS_OFF; |
| + |
| + // Set lite pages off if a lite page was not loaded for the main frame. |
| + if (web_url_response |
| + .httpHeaderField( |
| + WebString::fromUTF8("chrome-proxy-content-transform")) |
|
nasko
2017/02/16 18:10:02
Please define a string constant with a symbolic na
megjablon
2017/02/17 20:17:52
Done.
|
| + .utf8() != "lite-page") { |
| + previews_state_ &= ~(SERVER_LITE_PAGE_ON); |
| + } |
| + |
| if (extra_data) { |
| effective_connection_type_ = |
| EffectiveConnectionTypeToWebEffectiveConnectionType( |