Centralize command line checks for kEnableStreamlinedHostedApps.

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 36 matching lines @@
 #include "chrome/browser/devtools/devtools_toggle_action.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_event_router.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/pepper_broker_infobar_delegate.h"
@@ skipping 503 matching lines @@
 }
 
 base::string16 Browser::GetWindowTitleForCurrentTab() const {
   WebContents* contents = tab_strip_model_->GetActiveWebContents();
   base::string16 title;
 
   // |contents| can be NULL because GetWindowTitleForCurrentTab is called by the
   // window during the window's creation (before tabs have been added).
   if (contents) {
     // Streamlined hosted apps use the host instead of the title.
-    if (is_app() && CommandLine::ForCurrentProcess()->HasSwitch(
-                        switches::kEnableStreamlinedHostedApps)) {
+    if (is_app() && extensions::util::IsStreamlinedHostedAppsEnabled())
       return base::UTF8ToUTF16(contents->GetURL().host());
-    }
 
     title = contents->GetTitle();
     FormatTitleForDisplay(&title);
   }
   if (title.empty())
     title = CoreTabHelper::GetDefaultTitle();
 
 #if defined(OS_MACOSX)
   // On Mac, we don't want to suffix the page title with
   // the application name.
@@ skipping 1704 matching lines @@
     return;
   }
 }
 
 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) &&
+    if (extensions::util::IsStreamlinedHostedAppsEnabled() &&
         host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) {
-      // If kEnableStreamlinedHostedApps is true, show the location bar for
+      // If streamlined hosted apps are enabled, show the location bar for
       // 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;
@@ skipping 155 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;
 }