| Index: chrome/browser/ui/views/frame/browser_view.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
| index bcf02326df3ae7cd0bb1caf9e3722c873bd96ebe..1b24383ceb3bf6b79105dc64c6ff23b96f88200e 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view.cc
|
| @@ -1543,7 +1543,10 @@ bool BrowserView::ShouldShowWindowTitle() const {
|
| // For Ash only, trusted windows (apps and settings) do not show an icon,
|
| // crbug.com/119411. Child windows (i.e. popups) do show an icon.
|
| if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
|
| - browser_->is_trusted_source())
|
| + browser_->is_trusted_source() &&
|
| + !(browser_->is_app() &&
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableStreamlinedHostedApps)))
|
| return false;
|
|
|
| return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
|
| @@ -1572,7 +1575,10 @@ bool BrowserView::ShouldShowWindowIcon() const {
|
| // For Ash only, trusted windows (apps and settings) do not show an icon,
|
| // crbug.com/119411. Child windows (i.e. popups) do show an icon.
|
| if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
|
| - browser_->is_trusted_source())
|
| + browser_->is_trusted_source() &&
|
| + !(browser_->is_app() &&
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableStreamlinedHostedApps)))
|
| return false;
|
|
|
| return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
|
|
|