| 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 0253aa6c2ccee4cbb66d00b128d4f93848444dfa..02ead457f71db8ca42ef01a37382f52ff3ce95cd 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); | 
|  |