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

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6901003: Revert my recent changes regarding title directionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyrights Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 1d4849ffe5cc20014b621192bdd5e5224674c1ec..1310ec316de3532018a66b1f6ac766eec525e6b4 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/prerender/prerender_contents.h"
-#include "base/i18n/rtl.h"
#include "base/process_util.h"
#include "base/task.h"
#include "base/utf_string_conversions.h"
@@ -277,17 +276,14 @@ void PrerenderContents::DidNavigate(
url_ = params.url;
}
-void PrerenderContents::UpdateTitle(
- RenderViewHost* render_view_host,
- int32 page_id,
- const base::i18n::String16WithDirection& title) {
+void PrerenderContents::UpdateTitle(RenderViewHost* render_view_host,
+ int32 page_id,
+ const std::wstring& title) {
DCHECK_EQ(render_view_host_, render_view_host);
- if (title.string().empty())
+ if (title.empty())
return;
- // TODO(evan): use directionality of title.
- // http://code.google.com/p/chromium/issues/detail?id=27094
- title_ = title.string();
+ title_ = WideToUTF16Hack(title);
page_id_ = page_id;
}
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698