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 234 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 30 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)),
       synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
       bookmark_bar_state_(BookmarkBar::HIDDEN),
       command_controller_(new chrome::BrowserCommandController(
           this, g_browser_process->profile_manager())),
       window_has_shown_(false),
       chrome_updater_factory_(this),
       weak_factory_(this),
       translate_driver_observer_(
           new BrowserContentTranslateDriverObserver(this)) {
+  app_name_ = params.app_name;
+
   // If this causes a crash then a window is being opened using a profile type
   // that is disallowed by policy. The crash prevents the disabled window type
   // from opening at all, but the path that triggered it should be fixed.
   CHECK(IncognitoModePrefs::CanOpenBrowser(profile_));
   CHECK(!profile_->IsGuestSession() || profile_->IsOffTheRecord())
       << "Only off the record browser may be opened in guest mode";
 
   // TODO(jeremy): Move to initializer list once flag is removed.
   if (IsFastTabUnloadEnabled())
     fast_unload_controller_.reset(new chrome::FastUnloadController(this));
@@ skipping 1839 matching lines @@
     if (is_type_tabbed())
       features |= FEATURE_TOOLBAR;
 
     ExtensionService* service =
         extensions::ExtensionSystem::Get(profile_)->extension_service();
     const extensions::Extension* extension =
         service ? service->GetInstalledExtension(
                       web_app::GetExtensionIdFromApplicationName(app_name()))
                 : NULL;
 
-    if (!is_app() || (app_type() == APP_TYPE_HOST &&
+    if (!is_app() || (type() == TYPE_HOSTED_POPUP &&
                       app_name() != DevToolsWindow::kDevToolsApp &&
                       (!extension || !extension->is_legacy_packaged_app()) &&
                       CommandLine::ForCurrentProcess()->HasSwitch(
                           switches::kEnableStreamlinedHostedApps))) {
       features |= FEATURE_LOCATIONBAR;
     }
   }
   return !!(features & feature);
 }
 
@@ skipping 118 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;
 }