| 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 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3870 base::string16 title16 = title.utf16(); | 3870 base::string16 title16 = title.utf16(); |
| 3871 base::string16 shortened_title = title16.substr(0, kMaxTitleChars); | 3871 base::string16 shortened_title = title16.substr(0, kMaxTitleChars); |
| 3872 Send(new FrameHostMsg_UpdateTitle(routing_id_, | 3872 Send(new FrameHostMsg_UpdateTitle(routing_id_, |
| 3873 shortened_title, direction)); | 3873 shortened_title, direction)); |
| 3874 } | 3874 } |
| 3875 | 3875 |
| 3876 // Also check whether we have new encoding name. | 3876 // Also check whether we have new encoding name. |
| 3877 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); | 3877 UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); |
| 3878 } | 3878 } |
| 3879 | 3879 |
| 3880 void RenderFrameImpl::didChangeIcon(blink::WebLocalFrame* frame, | 3880 void RenderFrameImpl::didChangeIcon(blink::WebIconURL::Type icon_type) { |
| 3881 blink::WebIconURL::Type icon_type) { | |
| 3882 DCHECK_EQ(frame_, frame); | |
| 3883 // TODO(nasko): Investigate wheather implementation should move here. | 3881 // TODO(nasko): Investigate wheather implementation should move here. |
| 3884 render_view_->didChangeIcon(frame, icon_type); | 3882 render_view_->didChangeIcon(frame_, icon_type); |
| 3885 } | 3883 } |
| 3886 | 3884 |
| 3887 void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame) { | 3885 void RenderFrameImpl::didFinishDocumentLoad(blink::WebLocalFrame* frame) { |
| 3888 TRACE_EVENT1("navigation,benchmark,rail", | 3886 TRACE_EVENT1("navigation,benchmark,rail", |
| 3889 "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_); | 3887 "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_); |
| 3890 DCHECK_EQ(frame_, frame); | 3888 DCHECK_EQ(frame_, frame); |
| 3891 | 3889 |
| 3892 Send(new FrameHostMsg_DidFinishDocumentLoad(routing_id_)); | 3890 Send(new FrameHostMsg_DidFinishDocumentLoad(routing_id_)); |
| 3893 | 3891 |
| 3894 for (auto& observer : render_view_->observers()) | 3892 for (auto& observer : render_view_->observers()) |
| (...skipping 3074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6969 policy(info.defaultPolicy), | 6967 policy(info.defaultPolicy), |
| 6970 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6968 replaces_current_history_item(info.replacesCurrentHistoryItem), |
| 6971 history_navigation_in_new_child_frame( | 6969 history_navigation_in_new_child_frame( |
| 6972 info.isHistoryNavigationInNewChildFrame), | 6970 info.isHistoryNavigationInNewChildFrame), |
| 6973 client_redirect(info.isClientRedirect), | 6971 client_redirect(info.isClientRedirect), |
| 6974 cache_disabled(info.isCacheDisabled), | 6972 cache_disabled(info.isCacheDisabled), |
| 6975 form(info.form), | 6973 form(info.form), |
| 6976 source_location(info.sourceLocation) {} | 6974 source_location(info.sourceLocation) {} |
| 6977 | 6975 |
| 6978 } // namespace content | 6976 } // namespace content |
| OLD | NEW |