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

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 573 matching lines @@
   // any calls to BrowserList::GetLastActive() (for example, in bookmark_util),
   // will return the previous browser.
   BrowserList::SetLastActive(browser());
 
   // If the window is already visible, just activate it.
   if (frame_->IsVisible()) {
     frame_->Activate();
     return;
   }
 
-#if defined(USE_AURA)
-  if (!icon_updater_.get())
-    icon_updater_.reset(LauncherUpdater::Create(browser_.get()));
-#endif  // defined(USE_AURA)
+  CreateLauncherIcon();
 
   // Showing the window doesn't make the browser window active right away.
   // This can cause SetFocusToLocationBar() to skip setting focus to the
   // location bar. To avoid this we explicilty let SetFocusToLocationBar()
   // know that it's ok to steal focus.
   force_location_bar_focus_ = true;
 
   // Setting the focus doesn't work when the window is invisible, so any focus
   // initialization that happened before this will be lost.
   //
   // We really "should" restore the focus whenever the window becomes unhidden,
   // but I think initializing is the only time where this can happen where
   // there is some focus change we need to pick up, and this is easier than
   // plumbing through an un-hide message all the way from the frame.
   //
   // If we do find there are cases where we need to restore the focus on show,
   // that should be added and this should be removed.
   RestoreFocus();
 
   frame_->Show();
 
   force_location_bar_focus_ = false;
 
   browser()->OnWindowDidShow();
 }
 
 void BrowserView::ShowInactive() {
-  if (!frame_->IsVisible())
-    frame_->ShowInactive();
+  if (frame_->IsVisible())
+    return;
+  CreateLauncherIcon();
+  frame_->ShowInactive();
 }
 
 void BrowserView::SetBounds(const gfx::Rect& bounds) {
   ExitFullscreen();
   GetWidget()->SetBounds(bounds);
 }
 
 void BrowserView::Close() {
   frame_->Close();
 }
@@ skipping 1892 matching lines @@
     RemoveChildView(toolbar_);
     delete toolbar_;
   }
   toolbar_ = toolbar;
   if (toolbar) {
     AddChildView(toolbar_);
     toolbar_->Init();
   }
 }
 
+void BrowserView::CreateLauncherIcon() {
+#if defined(USE_AURA)
+  if (!icon_updater_.get())
+    icon_updater_.reset(LauncherUpdater::Create(browser_.get()));
+#endif  // defined(USE_AURA)
+}
+
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
   BrowserView* view = new BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
@@ skipping 11 matching lines @@
   browser::CreateViewsBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }