| 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 1934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1945 | 1945 |
| 1946 render_view_->last_page_id_sent_to_browser_ = | 1946 render_view_->last_page_id_sent_to_browser_ = |
| 1947 std::max(render_view_->last_page_id_sent_to_browser_, | 1947 std::max(render_view_->last_page_id_sent_to_browser_, |
| 1948 render_view_->page_id_); | 1948 render_view_->page_id_); |
| 1949 | 1949 |
| 1950 // If we end up reusing this WebRequest (for example, due to a #ref click), | 1950 // If we end up reusing this WebRequest (for example, due to a #ref click), |
| 1951 // we don't want the transition type to persist. Just clear it. | 1951 // we don't want the transition type to persist. Just clear it. |
| 1952 navigation_state->set_transition_type(PAGE_TRANSITION_LINK); | 1952 navigation_state->set_transition_type(PAGE_TRANSITION_LINK); |
| 1953 } | 1953 } |
| 1954 | 1954 |
| 1955 void RenderFrameImpl::didStartLoading() { | 1955 void RenderFrameImpl::didStartLoading(bool to_different_document) { |
| 1956 Send(new FrameHostMsg_DidStartLoading(routing_id_)); | 1956 Send(new FrameHostMsg_DidStartLoading(routing_id_, to_different_document)); |
| 1957 } | 1957 } |
| 1958 | 1958 |
| 1959 void RenderFrameImpl::didStopLoading() { | 1959 void RenderFrameImpl::didStopLoading() { |
| 1960 Send(new FrameHostMsg_DidStopLoading(routing_id_)); | 1960 Send(new FrameHostMsg_DidStopLoading(routing_id_)); |
| 1961 } | 1961 } |
| 1962 | 1962 |
| 1963 } // namespace content | 1963 } // namespace content |
| OLD | NEW |