diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 22:03:33 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 22:03:33 +0000 |
| commit | 22a3daa444d2ef3efd1e11fdcd6216c0f5b474a5 (patch) | |
| tree | 6686c4215744c76d15aa9c4798ae6ea19961bb07 /chrome | |
| parent | d16db3f11a734d8e687bfbe50d66a5ff0f422231 (diff) | |
| download | chromium_src-22a3daa444d2ef3efd1e11fdcd6216c0f5b474a5.zip chromium_src-22a3daa444d2ef3efd1e11fdcd6216c0f5b474a5.tar.gz chromium_src-22a3daa444d2ef3efd1e11fdcd6216c0f5b474a5.tar.bz2 | |
Fix BrowserTest.NoTitle/Title for chromeos build.
BUG=None
TEST=run browser_tests --gtest_filter=Browser.NoTitle (and Title)
Review URL: http://codereview.chromium.org/371076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 27e1423..f2c8f76 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -442,7 +442,8 @@ string16 Browser::GetWindowTitleForCurrentTab() const { title = l10n_util::GetStringUTF16(IDS_TAB_UNTITLED_TITLE); #if defined(OS_MACOSX) || defined(OS_CHROMEOS) - // On Mac, we don't want to suffix the page title with the application name. + // On Mac or ChromeOS, we don't want to suffix the page title with + // the application name. return title; #elif defined(OS_WIN) || defined(OS_LINUX) int string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT; diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 91f471a4..762be21 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -30,16 +30,17 @@ namespace { // Given a page title, returns the expected window caption string. std::wstring WindowCaptionFromPageTitle(std::wstring page_title) { -#if defined(OS_WIN) || defined(OS_LINUX) +#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); + return page_title; +#elif defined(OS_WIN) || defined(OS_LINUX) if (page_title.empty()) return l10n_util::GetString(IDS_PRODUCT_NAME); return l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT, page_title); -#elif defined(OS_MACOSX) - // On Mac, 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); - return page_title; #endif } |