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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 2f13de8372f21a272f767d3c15305eab8e65df8c..05ba5f276f480b7038bb8e77d49590096d14bfca 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2305,9 +2305,11 @@ bool Browser::ShouldShowLocationBar() const {
 
   if (is_app()) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableStreamlinedHostedApps)) {
+            switches::kEnableStreamlinedHostedApps) &&
+        host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) {
       // If kEnableStreamlinedHostedApps is true, show the location bar for
-      // bookmark apps.
+      // bookmark apps, except on ash which has the toolbar merged into the
+      // frame.
       ExtensionService* service =
           extensions::ExtensionSystem::Get(profile_)->extension_service();
       const extensions::Extension* extension =