Chromium Code Reviews| Index: content/renderer/render_view.cc |
| diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc |
| index 52c498213cb4e67ffbf605397344f58f0f7199a5..6a19a4abfc704e381381d1798d4ff1d30a78e7ab 100644 |
| --- a/content/renderer/render_view.cc |
| +++ b/content/renderer/render_view.cc |
| @@ -1179,15 +1179,16 @@ void RenderView::UpdateURL(WebFrame* frame) { |
| } |
| // Tell the embedding application that the title of the active page has changed |
| -void RenderView::UpdateTitle(WebFrame* frame, const string16& title) { |
| - // Ignore all but top level navigations... |
| - if (!frame->parent()) { |
| - Send(new ViewHostMsg_UpdateTitle( |
| - routing_id_, |
| - page_id_, |
| - title.length() > content::kMaxTitleChars ? |
| - title.substr(0, content::kMaxTitleChars) : title)); |
| - } |
| +void RenderView::UpdateTitle(WebFrame* frame, const string16& title, |
| + WebTextDirection title_direction) { |
|
jeremy
2011/08/02 09:34:37
nit: one param per line.
|
| + // Ignore all but top level navigations. |
| + if (frame->parent()) |
| + return; |
| + |
| + string16 shortened_title = title.substr(0, content::kMaxTitleChars); |
| + |
| + Send(new ViewHostMsg_UpdateTitle(routing_id_, page_id_, shortened_title, |
| + title_direction)); |
| } |
| void RenderView::UpdateEncoding(WebFrame* frame, |
| @@ -2541,9 +2542,7 @@ void RenderView::didCreateDocumentElement(WebFrame* frame) { |
| void RenderView::didReceiveTitle(WebFrame* frame, const WebString& title, |
| WebTextDirection direction) { |
| - // TODO: pass direction through various APIs. |
| - // http://code.google.com/p/chromium/issues/detail?id=79903 |
| - UpdateTitle(frame, title); |
| + UpdateTitle(frame, title, direction); |
| // Also check whether we have new encoding name. |
| UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); |
| @@ -2608,7 +2607,8 @@ void RenderView::didNavigateWithinPage( |
| didCommitProvisionalLoad(frame, is_new_navigation); |
| - UpdateTitle(frame, frame->view()->mainFrame()->dataSource()->pageTitle()); |
| + UpdateTitle(frame, frame->view()->mainFrame()->dataSource()->pageTitle(), |
| + frame->view()->mainFrame()->dataSource()->pageTitleDirection()); |
|
jeremy
2011/08/02 09:34:37
nit: how about putting frame->view()->mainFrame()-
|
| } |
| void RenderView::didUpdateCurrentHistoryItem(WebFrame* frame) { |