Panels back behind a flag.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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  // OS_WIN
@@ skipping 456 matching lines @@
 // static
 Browser* Browser::CreateForApp(Type type,
                                const std::string& app_name,
                                const gfx::Rect& window_bounds,
                                Profile* profile) {
   DCHECK(type != TYPE_TABBED);
   DCHECK(!app_name.empty());
 
   RegisterAppPrefs(app_name, profile);
 
+#if !defined(OS_CHROMEOS) || defined(USE_AURA)
   if (type == TYPE_PANEL &&
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisablePanels)) {
+      !PanelManager::ShouldUsePanels(
+          web_app::GetExtensionIdFromApplicationName(app_name))) {
     type = TYPE_POPUP;
   }
 #if defined(TOOLKIT_GTK)
   // Panels are only supported on a white list of window managers for Linux.
   if (type == TYPE_PANEL) {
     ui::WindowManagerName wm_type = ui::GuessWindowManager();
     if (wm_type != ui::WM_COMPIZ &&
         wm_type != ui::WM_ICE_WM &&
         wm_type != ui::WM_KWIN &&
         wm_type != ui::WM_METACITY &&
         wm_type != ui::WM_MUTTER) {
       type = TYPE_POPUP;
     }
   }
 #endif  // TOOLKIT_GTK
+#endif  // !OS_CHROMEOS || USE_AURA
 
   CreateParams params(type, profile);
   params.app_name = app_name;
   params.initial_bounds = window_bounds;
   return CreateWithParams(params);
 }
 
 // static
 Browser* Browser::CreateForDevTools(Profile* profile) {
 #if defined(OS_CHROMEOS)
@@ skipping 3777 matching lines @@
 gfx::Rect Browser::GetInstantBounds() {
   return window()->GetInstantBounds();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, protected:
 
 BrowserWindow* Browser::CreateBrowserWindow() {
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
   if (type_ == TYPE_PANEL) {
-    DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisablePanels));
     return PanelManager::GetInstance()->CreatePanel(this);
   }
 #endif
 
   return BrowserWindow::CreateBrowserWindow(this);
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Command and state updating (private):
@@ skipping 1030 matching lines @@
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   } else {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }