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 b93686564e08f7010c70be91b3e7b3722df74903..87fe7ed1f87e7ff2f15d5b6b1955e7574abfe211 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2300,9 +2300,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 =