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() { |