OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1169 &new_url)) { | 1169 &new_url)) { |
1170 request.setURL(WebURL(new_url)); | 1170 request.setURL(WebURL(new_url)); |
1171 } | 1171 } |
1172 | 1172 |
1173 if (internal_data->is_cache_policy_override_set()) | 1173 if (internal_data->is_cache_policy_override_set()) |
1174 request.setCachePolicy(internal_data->cache_policy_override()); | 1174 request.setCachePolicy(internal_data->cache_policy_override()); |
1175 | 1175 |
1176 blink::WebReferrerPolicy referrer_policy; | 1176 blink::WebReferrerPolicy referrer_policy; |
1177 if (internal_data->is_referrer_policy_set()) { | 1177 if (internal_data->is_referrer_policy_set()) { |
1178 referrer_policy = internal_data->referrer_policy(); | 1178 referrer_policy = internal_data->referrer_policy(); |
1179 internal_data->clear_referrer_policy(); | |
1180 } else { | 1179 } else { |
1181 referrer_policy = frame->document().referrerPolicy(); | 1180 referrer_policy = frame->document().referrerPolicy(); |
1182 } | 1181 } |
1183 | 1182 |
1184 // The request's extra data may indicate that we should set a custom user | 1183 // The request's extra data may indicate that we should set a custom user |
1185 // agent. This needs to be done here, after WebKit is through with setting the | 1184 // agent. This needs to be done here, after WebKit is through with setting the |
1186 // user agent on its own. | 1185 // user agent on its own. |
1187 WebString custom_user_agent; | 1186 WebString custom_user_agent; |
1188 bool was_after_preconnect_request = false; | 1187 bool was_after_preconnect_request = false; |
1189 if (request.extraData()) { | 1188 if (request.extraData()) { |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1532 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1531 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
1533 observers_.AddObserver(observer); | 1532 observers_.AddObserver(observer); |
1534 } | 1533 } |
1535 | 1534 |
1536 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1535 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
1537 observer->RenderFrameGone(); | 1536 observer->RenderFrameGone(); |
1538 observers_.RemoveObserver(observer); | 1537 observers_.RemoveObserver(observer); |
1539 } | 1538 } |
1540 | 1539 |
1541 } // namespace content | 1540 } // namespace content |
OLD | NEW |