| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 1595e868001d614ce36dc7d5dc0e6cc947427210..07f987192dcade25b60c0eaa0656451862cc0a02 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -378,7 +378,6 @@ Browser::Browser(const CreateParams& params)
|
| override_bounds_(params.initial_bounds),
|
| initial_show_state_(params.initial_show_state),
|
| is_session_restore_(params.is_session_restore),
|
| - host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
|
| content_setting_bubble_model_delegate_(
|
| new BrowserContentSettingBubbleModelDelegate(this)),
|
| toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
|
| @@ -624,16 +623,10 @@ base::string16 Browser::GetWindowTitleForCurrentTab() const {
|
| if (title.empty())
|
| title = CoreTabHelper::GetDefaultTitle();
|
|
|
| -#if defined(OS_MACOSX)
|
| - // On Mac, we don't want to suffix the page title with
|
| - // the application name.
|
| +#if defined(OS_MACOSX) || defined(USE_ASH)
|
| + // On Mac and Ash, we don't want to suffix the page title with the application
|
| + // name.
|
| return title;
|
| -#elif defined(USE_ASH)
|
| - // On Ash, we don't want to suffix the page title with the application name,
|
| - // but on Windows, where USE_ASH can also be true, we still want the prefix
|
| - // on desktop.
|
| - if (host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
|
| - return title;
|
| #endif
|
| // Don't append the app name to window titles on app frames and app popups
|
| return is_app() ?
|
|
|