diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:08:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-29 20:08:33 +0000 |
| commit | 7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a (patch) | |
| tree | 3b997b69adc872122ada0872405017c9a4f18cc8 /chrome/browser/browser_browsertest.cc | |
| parent | 8d4db9d979a78a413fb28e02ae286643c86972ee (diff) | |
| download | chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.zip chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.tar.gz chromium_src-7c8c869c9cd34e78dc40d7c9840aa7b4b778ba0a.tar.bz2 | |
Remove wstring from l10n_util. Part 3.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index ae52bac..b286711 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -65,14 +65,18 @@ std::wstring WindowCaptionFromPageTitle(std::wstring page_title) { #if defined(OS_MACOSX) || defined(OS_CHROMEOS) // On Mac or ChromeOS, we don't want to suffix the page title with // the application name. - if (page_title.empty()) - return l10n_util::GetString(IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED); + if (page_title.empty()) { + return UTF16ToWideHack( + l10n_util::GetStringUTF16(IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED)); + } return page_title; #else if (page_title.empty()) - return l10n_util::GetString(IDS_PRODUCT_NAME); + return UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); - return l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT, page_title); + return UTF16ToWideHack( + l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, + WideToUTF16Hack(page_title))); #endif } |