diff options
| -rw-r--r-- | chrome/app/chromium_strings.grd | 3 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 11 |
3 files changed, 5 insertions, 12 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 4509bb4..0220efa 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -288,9 +288,6 @@ be available for now. --> <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows"> <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium </message> - <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT_NO_LOGO" desc="The format for titles displayed when the window has no distributor logo displayed"> - <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - </message> <if expr="not pp_ifdef('chromeos')"> <message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page."> Get help with using Chromium diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 2222b78..031d98f 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -211,9 +211,6 @@ Chrome supports. --> <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows"> <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Google Chrome </message> - <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT_NO_LOGO" desc="The format for titles displayed when the window has no distributor logo displayed"> - <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - </message> <if expr="not pp_ifdef('chromeos')"> <message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page."> Get help with using Chrome diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 005d66c..4c430dc 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -7,7 +7,7 @@ #if defined(OS_WIN) #include <windows.h> #include <shellapi.h> -#endif // OS_WIN +#endif // defined(OS_WIN) #include <algorithm> #include <string> @@ -569,11 +569,10 @@ string16 Browser::GetWindowTitleForCurrentTab() const { // the application name. return title; #else - int string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT; // Don't append the app name to window titles on app frames and app popups - if (is_app()) - string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT_NO_LOGO; - return l10n_util::GetStringFUTF16(string_id, title); + return is_app() ? + title : + l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, title); #endif } @@ -1255,7 +1254,7 @@ void Browser::OnWindowDidShow() { base::Time::Now() - *process_creation_time); } } -#endif // OS_MACOSX || OS_WIN +#endif // defined(OS_MACOSX) || defined(OS_WIN) // Nothing to do for non-tabbed windows. if (!is_type_tabbed()) |