| 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 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 // If the navigation is browser-initiated, the NavigationState contains the | 1113 // If the navigation is browser-initiated, the NavigationState contains the |
| 1114 // correct value instead of the WebDataSource. | 1114 // correct value instead of the WebDataSource. |
| 1115 // | 1115 // |
| 1116 // TODO(davidben): Avoid this awkward duplication of state. See comment on | 1116 // TODO(davidben): Avoid this awkward duplication of state. See comment on |
| 1117 // NavigationState::should_replace_current_entry(). | 1117 // NavigationState::should_replace_current_entry(). |
| 1118 should_replace_current_entry = | 1118 should_replace_current_entry = |
| 1119 navigation_state->should_replace_current_entry(); | 1119 navigation_state->should_replace_current_entry(); |
| 1120 } | 1120 } |
| 1121 request.setExtraData( | 1121 request.setExtraData( |
| 1122 new RequestExtraData(referrer_policy, | 1122 new RequestExtraData(referrer_policy, |
| 1123 render_view_->visibilityState(), |
| 1123 custom_user_agent, | 1124 custom_user_agent, |
| 1124 was_after_preconnect_request, | 1125 was_after_preconnect_request, |
| 1125 routing_id_, | 1126 routing_id_, |
| 1126 (frame == top_frame), | 1127 (frame == top_frame), |
| 1127 frame->identifier(), | 1128 frame->identifier(), |
| 1128 GURL(frame->document().securityOrigin().toString()), | 1129 GURL(frame->document().securityOrigin().toString()), |
| 1129 frame->parent() == top_frame, | 1130 frame->parent() == top_frame, |
| 1130 frame->parent() ? frame->parent()->identifier() : -1, | 1131 frame->parent() ? frame->parent()->identifier() : -1, |
| 1131 navigation_state->allow_download(), | 1132 navigation_state->allow_download(), |
| 1132 transition_type, | 1133 transition_type, |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1433 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1434 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
| 1434 observers_.AddObserver(observer); | 1435 observers_.AddObserver(observer); |
| 1435 } | 1436 } |
| 1436 | 1437 |
| 1437 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1438 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
| 1438 observer->RenderFrameGone(); | 1439 observer->RenderFrameGone(); |
| 1439 observers_.RemoveObserver(observer); | 1440 observers_.RemoveObserver(observer); |
| 1440 } | 1441 } |
| 1441 | 1442 |
| 1442 } // namespace content | 1443 } // namespace content |
| OLD | NEW |