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

chrome/browser/ui/browser.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 2287 matching lines @@
   }
 }
 
 bool Browser::ShouldShowLocationBar() const {
   // Tabbed browser always show a location bar.
   if (is_type_tabbed())
     return true;
 
   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 =
           service ? service->GetInstalledExtension(
                         web_app::GetExtensionIdFromApplicationName(app_name()))
                   : NULL;
       return (!extension || extension->from_bookmark()) &&
              app_name() != DevToolsWindow::kDevToolsApp;
     } else {
       return false;
@@ skipping 153 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }