Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2829923003: Remove redundant WebLocalFrame* parameter from DidReceiveTitle (Closed)
Patch Set: Rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/shell/test_runner/web_frame_test_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3852 matching lines...) Expand 10 before | Expand all | Expand 10 after
3863 if (mojo_bindings_controller) 3863 if (mojo_bindings_controller)
3864 mojo_bindings_controller->RunScriptsAtDocumentStart(); 3864 mojo_bindings_controller->RunScriptsAtDocumentStart();
3865 3865
3866 if (!weak_self.get()) 3866 if (!weak_self.get())
3867 return; 3867 return;
3868 3868
3869 GetContentClient()->renderer()->RunScriptsAtDocumentStart(this); 3869 GetContentClient()->renderer()->RunScriptsAtDocumentStart(this);
3870 // Do not use |this| or |frame|! ContentClient might have deleted them by now! 3870 // Do not use |this| or |frame|! ContentClient might have deleted them by now!
3871 } 3871 }
3872 3872
3873 void RenderFrameImpl::DidReceiveTitle(blink::WebLocalFrame* frame, 3873 void RenderFrameImpl::DidReceiveTitle(const blink::WebString& title,
3874 const blink::WebString& title,
3875 blink::WebTextDirection direction) { 3874 blink::WebTextDirection direction) {
3876 DCHECK_EQ(frame_, frame);
3877 // Ignore all but top level navigations. 3875 // Ignore all but top level navigations.
3878 if (!frame->Parent()) { 3876 if (!frame_->Parent()) {
3879 base::trace_event::TraceLog::GetInstance()->UpdateProcessLabel( 3877 base::trace_event::TraceLog::GetInstance()->UpdateProcessLabel(
3880 routing_id_, title.Utf8()); 3878 routing_id_, title.Utf8());
3881 3879
3882 base::string16 title16 = title.Utf16(); 3880 base::string16 title16 = title.Utf16();
3883 base::string16 shortened_title = title16.substr(0, kMaxTitleChars); 3881 base::string16 shortened_title = title16.substr(0, kMaxTitleChars);
3884 Send(new FrameHostMsg_UpdateTitle(routing_id_, 3882 Send(new FrameHostMsg_UpdateTitle(routing_id_,
3885 shortened_title, direction)); 3883 shortened_title, direction));
3886 } 3884 }
3887 3885
3888 // Also check whether we have new encoding name. 3886 // Also check whether we have new encoding name.
3889 UpdateEncoding(frame, frame->View()->PageEncoding().Utf8()); 3887 UpdateEncoding(frame_, frame_->View()->PageEncoding().Utf8());
3890 } 3888 }
3891 3889
3892 void RenderFrameImpl::DidChangeIcon(blink::WebIconURL::Type icon_type) { 3890 void RenderFrameImpl::DidChangeIcon(blink::WebIconURL::Type icon_type) {
3893 // TODO(nasko): Investigate wheather implementation should move here. 3891 // TODO(nasko): Investigate wheather implementation should move here.
3894 render_view_->didChangeIcon(frame_, icon_type); 3892 render_view_->didChangeIcon(frame_, icon_type);
3895 } 3893 }
3896 3894
3897 void RenderFrameImpl::DidFinishDocumentLoad(blink::WebLocalFrame* frame) { 3895 void RenderFrameImpl::DidFinishDocumentLoad(blink::WebLocalFrame* frame) {
3898 TRACE_EVENT1("navigation,benchmark,rail", 3896 TRACE_EVENT1("navigation,benchmark,rail",
3899 "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_); 3897 "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_);
(...skipping 3100 matching lines...) Expand 10 before | Expand all | Expand 10 after
7000 policy(info.default_policy), 6998 policy(info.default_policy),
7001 replaces_current_history_item(info.replaces_current_history_item), 6999 replaces_current_history_item(info.replaces_current_history_item),
7002 history_navigation_in_new_child_frame( 7000 history_navigation_in_new_child_frame(
7003 info.is_history_navigation_in_new_child_frame), 7001 info.is_history_navigation_in_new_child_frame),
7004 client_redirect(info.is_client_redirect), 7002 client_redirect(info.is_client_redirect),
7005 cache_disabled(info.is_cache_disabled), 7003 cache_disabled(info.is_cache_disabled),
7006 form(info.form), 7004 form(info.form),
7007 source_location(info.source_location) {} 7005 source_location(info.source_location) {}
7008 7006
7009 } // namespace content 7007 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/shell/test_runner/web_frame_test_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698