Introduce new WebApp header style for hosted apps and fizzy apps on ash.

chrome/browser/ui/views/frame/browser_view.cc

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 df570597acac07749ce20c025431b344c28bd0c1..71bfe02e959a5e59852948f8816017f6971b2f4f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1542,7 +1542,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);
@@ -1571,7 +1574,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);