summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-03 23:10:47 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-03 23:10:47 +0000
commit750fcf8791a39574861f9ef27d45023a55bd4e22 (patch)
tree2abbde7f097c9a8762bcff227c52f14156390abc /content
parenta5f9f373450f82d5a0a107473da6cd5f232d4ec9 (diff)
downloadchromium_src-750fcf8791a39574861f9ef27d45023a55bd4e22.zip
chromium_src-750fcf8791a39574861f9ef27d45023a55bd4e22.tar.gz
chromium_src-750fcf8791a39574861f9ef27d45023a55bd4e22.tar.bz2
rtl titles: minor issues spotted by Jeremy in r95007.
(His comments came in after I had already landed.) Fix some style nits as well as a copy'n'paste error. Review URL: http://codereview.chromium.org/7508038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_view_host.cc2
-rw-r--r--content/browser/renderer_host/render_view_host.h3
-rw-r--r--content/renderer/render_view.cc7
3 files changed, 7 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index af7823a..3f12fc2 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -69,7 +69,7 @@ base::i18n::TextDirection WebTextDirectionToChromeTextDirection(
case WebKit::WebTextDirectionLeftToRight:
return base::i18n::LEFT_TO_RIGHT;
case WebKit::WebTextDirectionRightToLeft:
- return base::i18n::LEFT_TO_RIGHT;
+ return base::i18n::RIGHT_TO_LEFT;
default:
NOTREACHED();
return base::i18n::UNKNOWN_DIRECTION;
diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h
index e2874f9..c6a8010 100644
--- a/content/browser/renderer_host/render_view_host.h
+++ b/content/browser/renderer_host/render_view_host.h
@@ -412,7 +412,8 @@ class RenderViewHost : public RenderWidgetHost {
void OnMsgNavigate(const IPC::Message& msg);
void OnMsgUpdateState(int32 page_id,
const std::string& state);
- void OnMsgUpdateTitle(int32 page_id, const string16& title,
+ void OnMsgUpdateTitle(int32 page_id,
+ const string16& title,
WebKit::WebTextDirection title_direction);
void OnMsgUpdateEncoding(const std::string& encoding);
void OnMsgUpdateTargetURL(int32 page_id, const GURL& url);
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index d5cedec..368cc33 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -1179,7 +1179,8 @@ 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,
+void RenderView::UpdateTitle(WebFrame* frame,
+ const string16& title,
WebTextDirection title_direction) {
// Ignore all but top level navigations.
if (frame->parent())
@@ -2606,8 +2607,8 @@ void RenderView::didNavigateWithinPage(
didCommitProvisionalLoad(frame, is_new_navigation);
- UpdateTitle(frame, frame->view()->mainFrame()->dataSource()->pageTitle(),
- frame->view()->mainFrame()->dataSource()->pageTitleDirection());
+ WebDataSource* datasource = frame->view()->mainFrame()->dataSource();
+ UpdateTitle(frame, datasource->pageTitle(), datasource->pageTitleDirection());
}
void RenderView::didUpdateCurrentHistoryItem(WebFrame* frame) {