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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 3108027: Convert GetDisplayStringInLTRDirectionality from wstring to string16. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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/search_engines/template_url_table_model.cc ('k') | chrome/browser/task_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index dbcf1dded11747686c4c68afc2a38acb7bfeb40a..9ee487be62b764276670c3c9227a47445b373f69 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -3162,14 +3162,14 @@ std::wstring TabContents::GetMessageBoxTitle(const GURL& frame_url,
// TODO(brettw) it should be easier than this to do the correct language
// handling without getting the accept language from the profile.
- std::wstring base_address = gfx::ElideUrl(clean_url, gfx::Font(), 0,
- UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)));
+ string16 base_address = WideToUTF16(gfx::ElideUrl(clean_url, gfx::Font(), 0,
+ UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages))));
Evan Martin 2010/08/18 00:38:08 I think there's a GetStringUTF16 now
// Force URL to have LTR directionality.
- base::i18n::GetDisplayStringInLTRDirectionality(&base_address);
+ base_address = base::i18n::GetDisplayStringInLTRDirectionality(base_address);
- return l10n_util::GetStringF(
+ return UTF16ToWide(l10n_util::GetStringFUTF16(
is_alert ? IDS_JAVASCRIPT_ALERT_TITLE : IDS_JAVASCRIPT_MESSAGEBOX_TITLE,
- base_address);
+ base_address));
}
gfx::NativeWindow TabContents::GetMessageBoxRootWindow() {
« no previous file with comments | « chrome/browser/search_engines/template_url_table_model.cc ('k') | chrome/browser/task_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698