Elim Browser::AppType

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 233 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams(Profile* profile,
                                     chrome::HostDesktopType host_desktop_type)
     : type(TYPE_TABBED),
       profile(profile),
       host_desktop_type(host_desktop_type),
-      app_type(APP_TYPE_HOST),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
       is_session_restore(false),
       window(NULL) {
 }
 
 Browser::CreateParams::CreateParams(Type type,
                                     Profile* profile,
                                     chrome::HostDesktopType host_desktop_type)
     : type(type),
       profile(profile),
       host_desktop_type(host_desktop_type),
-      app_type(APP_TYPE_HOST),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
       is_session_restore(false),
       window(NULL) {
 }
 
 // static
 Browser::CreateParams Browser::CreateParams::CreateForApp(
     Type type,
     const std::string& app_name,
     const gfx::Rect& window_bounds,
     Profile* profile,
     chrome::HostDesktopType host_desktop_type) {
   DCHECK(type != TYPE_TABBED);
   DCHECK(!app_name.empty());
 
   CreateParams params(type, profile, host_desktop_type);
   params.app_name = app_name;
-  params.app_type = APP_TYPE_CHILD;
   params.initial_bounds = window_bounds;
 
   return params;
 }
 
 // static
 Browser::CreateParams Browser::CreateParams::CreateForDevTools(
     Profile* profile,
     chrome::HostDesktopType host_desktop_type) {
   CreateParams params(TYPE_POPUP, profile, host_desktop_type);
@@ skipping 31 matching lines @@
 // Browser, Constructors, Creation, Showing:
 
 Browser::Browser(const CreateParams& params)
     : type_(params.type),
       profile_(params.profile),
       window_(NULL),
       tab_strip_model_delegate_(new chrome::BrowserTabStripModelDelegate(this)),
       tab_strip_model_(new TabStripModel(tab_strip_model_delegate_.get(),
                                          params.profile)),
       app_name_(params.app_name),
-      app_type_(params.app_type),
       cancel_download_confirmation_state_(NOT_PROMPTED),
       override_bounds_(params.initial_bounds),
       initial_show_state_(params.initial_show_state),
       is_session_restore_(params.is_session_restore),
       host_desktop_type_(BrowserWindow::AdjustHostDesktopType(
           params.host_desktop_type)),
       content_setting_bubble_model_delegate_(
           new BrowserContentSettingBubbleModelDelegate(this)),
       toolbar_model_delegate_(new BrowserToolbarModelDelegate(this)),
       tab_restore_service_delegate_(new BrowserTabRestoreServiceDelegate(this)),
@@ skipping 1832 matching lines @@
     if (interstitial_observers_[i]->web_contents() != contents)
       continue;
 
     delete interstitial_observers_[i];
     interstitial_observers_.erase(interstitial_observers_.begin() + i);
     return;
   }
 }
 
 bool Browser::ShouldShowLocationBar() const {
-  if (!is_app()) {
-    // Hide the URL for singleton settings windows.
-    // TODO(stevenjb): We could avoid this check by setting a Browser
-    // property for "system" windows, possibly shared with hosted app windows.
-    // crbug.com/350128.
-    if (chrome::IsSettingsWindow(this))
-      return false;
+  // Trusted apps and system windows (e.g. settings) do not show a location bar.
+  if (type() == TYPE_TRUSTED_POPUP)
+    return false;
+
+  // Other non-app browsers always show a location bar.
+  if (!is_app())
     return true;
+
+  // Normally non trusted app windows do not show a location bar.
+  if (app_name() == DevToolsWindow::kDevToolsApp ||
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableStreamlinedHostedApps)) {
+    return false;
   }
 
-  // Normally apps do not show a location bar.
-  if (app_type() != APP_TYPE_HOST ||
-      app_name() == DevToolsWindow::kDevToolsApp ||
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableStreamlinedHostedApps))
-    return false;
-
   // If kEnableStreamlinedHostedApps is true, show the locaiton bar for non
   // legacy packaged apps.
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   const extensions::Extension* extension =
       service ? service->GetInstalledExtension(
                     web_app::GetExtensionIdFromApplicationName(app_name()))
               : NULL;
   return (!extension || !extension->is_legacy_packaged_app());
 }
@@ skipping 144 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;
 }