Elim Browser::AppType

chrome/browser/ui/browser_commands.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_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 648 matching lines @@
     // window next to the tab being duplicated.
     int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
     pinned = browser->tab_strip_model()->IsTabPinned(index);
     int add_types = TabStripModel::ADD_ACTIVE |
         TabStripModel::ADD_INHERIT_GROUP |
         (pinned ? TabStripModel::ADD_PINNED : 0);
     browser->tab_strip_model()->InsertWebContentsAt(
         index + 1, contents_dupe, add_types);
   } else {
     Browser* new_browser = NULL;
-    if (browser->is_app() &&
-        !browser->is_type_popup()) {
+    if (browser->is_app() && browser->type() != Browser::TYPE_TABBED) {
       new_browser = new Browser(
           Browser::CreateParams::CreateForApp(browser->type(),
                                               browser->app_name(),
                                               gfx::Rect(),
                                               browser->profile(),
                                               browser->host_desktop_type()));
     } else {
       new_browser = new Browser(
           Browser::CreateParams(browser->type(), browser->profile(),
                                 browser->host_desktop_type()));
@@ skipping 571 matching lines @@
 void ConvertTabToAppWindow(Browser* browser,
                            content::WebContents* contents) {
   const GURL& url = contents->GetController().GetActiveEntry()->GetURL();
   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
 
   int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
   if (index >= 0)
     browser->tab_strip_model()->DetachWebContentsAt(index);
 
   Browser* app_browser = new Browser(
-      Browser::CreateParams::CreateForApp(
-          Browser::TYPE_POPUP, app_name, gfx::Rect(), browser->profile(),
-          browser->host_desktop_type()));
+      Browser::CreateParams::CreateForApp(Browser::TYPE_TRUSTED_POPUP,
+                                          app_name,
+                                          gfx::Rect(),
+                                          browser->profile(),
+                                          browser->host_desktop_type()));
   app_browser->tab_strip_model()->AppendWebContents(contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome