Elim Browser::AppType

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 71624dcbe8f73488b57224e0a54c9f62085e83f1..35fb5486b5a0d58a4f25a77e3a99e9476565501e 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -252,7 +252,6 @@ Browser::CreateParams::CreateParams(Profile* profile,
     : 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) {
@@ -264,7 +263,6 @@ Browser::CreateParams::CreateParams(Type 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) {
@@ -282,7 +280,6 @@ Browser::CreateParams Browser::CreateParams::CreateForApp(
 
   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;
@@ -333,8 +330,6 @@ Browser::Browser(const CreateParams& params)
       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),
@@ -354,6 +349,8 @@ Browser::Browser(const CreateParams& params)
       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.
@@ -2213,7 +2210,7 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
                       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(