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

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 ce5ae79c8f545e0a5d0cda7d625198904c2a1fc5..788823605b95b5c0bccd4c1bb96c3c5847717f17 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -4595,10 +4595,18 @@ void Browser::ShowFirstRunBubble() {
 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())
-    return PanelManager::GetInstance()->CreatePanel(this);
+#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  // OS_ANDROID
 
   return BrowserWindow::CreateBrowserWindow(this);
 }