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

chrome/browser/extensions/extension_tab_helper.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/extensions/extension_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
@@ skipping 46 matching lines @@
   extension_app_ = extension;
 
   UpdateExtensionAppIcon(extension_app_);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
       content::Source<ExtensionTabHelper>(this),
       content::NotificationService::NoDetails());
 }
 
-void ExtensionTabHelper::SetExtensionAppById(
+const Extension* ExtensionTabHelper::GetExtension(

[sky, 2012/03/05 15:20:25]

Make order match header.

[stevenjb, 2012/03/05 19:50:06]

Done.

     const std::string& extension_app_id) {
   if (extension_app_id.empty())
-    return;
+    return NULL;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   ExtensionService* extension_service = profile->GetExtensionService();
   if (!extension_service || !extension_service->is_ready())
-    return;
+    return NULL;
 
   const Extension* extension =
       extension_service->GetExtensionById(extension_app_id, false);
+  return extension;
+}
+
+void ExtensionTabHelper::SetExtensionAppById(
+    const std::string& extension_app_id) {
+  const Extension* extension = GetExtension(extension_app_id);
   if (extension)
     SetExtensionApp(extension);
 }
 
+void ExtensionTabHelper::SetExtensionAppIconById(
+    const std::string& extension_app_id) {
+  const Extension* extension = GetExtension(extension_app_id);
+  if (extension)
+    UpdateExtensionAppIcon(extension);
+}
+
 SkBitmap* ExtensionTabHelper::GetExtensionAppIcon() {
   if (extension_app_icon_.empty())
     return NULL;
 
   return &extension_app_icon_;
 }
 
 void ExtensionTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
@@ skipping 191 matching lines @@
 void ExtensionTabHelper::OnInlineInstallFailure(int install_id,
                                                 int return_route_id,
                                                 const std::string& error) {
   Send(new ExtensionMsg_InlineWebstoreInstallResponse(
       return_route_id, install_id, false, error));
 }
 
 WebContents* ExtensionTabHelper::GetAssociatedWebContents() const {
   return web_contents();
 }