Launch panels as popup windows in Aura, and add separate launcher icon logic for panels.

chrome/browser/ui/browser.cc

 // Copyright (c) 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  // OS_WIN
@@ skipping 4577 matching lines @@
 void Browser::ShowFirstRunBubble() {
   window()->GetLocationBar()->ShowFirstRunBubble();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, protected:
 
 BrowserWindow* Browser::CreateBrowserWindow() {
   // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
   // Android build.
-#if (!defined(OS_CHROMEOS) || defined(USE_AURA)) && !defined(OS_ANDROID)
-  if (is_type_panel())
+#if !defined(OS_ANDROID)
+  bool create_panel = false;
+#if defined(USE_AURA)
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          ash::switches::kAuraPanelManager))
+    create_panel = is_type_panel();
+#elif !defined(OS_CHROMEOS)
+  create_panel = is_type_panel();
+#endif
+  if (create_panel)
     return PanelManager::GetInstance()->CreatePanel(this);
-#endif
+#endif  // OS_ANDROID
 
   return BrowserWindow::CreateBrowserWindow(this);
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Command and state updating (private):
 
 void Browser::InitCommandState() {
   // All browser commands whose state isn't set automagically some other way
@@ skipping 1007 matching lines @@
     ShowSingletonTabOverwritingNTP(params);
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI();
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }