Add a flag that lets the webstore show a different UI on app install.

chrome/browser/ui/views/extensions/extension_installed_bubble.cc

Index: chrome/browser/ui/views/extensions/extension_installed_bubble.cc
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index f9e30abb5188a5a516b6d1a468b36e2109d1477e..993a7f559cf0743eb032b87d60ecd99f1950591b 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -9,12 +9,14 @@
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ -28,6 +30,8 @@
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
+#include "views/controls/link.h"
+#include "views/controls/link_listener.h"
 #include "views/layout/layout_constants.h"
 #include "views/view.h"
 
@@ -78,12 +82,16 @@ void ShowExtensionInstalledBubble(
 // ExtensionInstalledBubble. It displays the install icon and explanatory
 // text about the installed extension.
 class InstalledBubbleContent : public views::View,
-                               public views::ButtonListener {
+                               public views::ButtonListener,
+                               public views::LinkListener {
  public:
-  InstalledBubbleContent(const Extension* extension,
+  InstalledBubbleContent(Browser* browser,
+                         const Extension* extension,
                          ExtensionInstalledBubble::BubbleType type,
                          SkBitmap* icon)
-      : bubble_(NULL),
+      : browser_(browser),
+        extension_id_(extension->id()),
+        bubble_(NULL),
         type_(type),
         info_(NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ -127,12 +135,23 @@ class InstalledBubbleContent : public views::View,
       AddChildView(info_);
     }
 
-    manage_ = new views::Label(UTF16ToWide(
-        l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_INFO)));
-    manage_->SetFont(font);
-    manage_->SetMultiLine(true);
-    manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-    AddChildView(manage_);
+    if (type_ == ExtensionInstalledBubble::APP) {
+      views::Link* link = new views::Link(UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_EXTENSION_INSTALLED_APP_INFO)));
+      link->set_listener(this);
+      manage_ = link;
+      manage_->SetFont(font);
+      manage_->SetMultiLine(true);
+      manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+      AddChildView(manage_);
+    } else {
+      manage_ = new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_INFO)));
+      manage_->SetFont(font);
+      manage_->SetMultiLine(true);
+      manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+      AddChildView(manage_);
+    }
 
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
@@ -157,6 +176,12 @@ class InstalledBubbleContent : public views::View,
     }
   }
 
+  // Implements the views::LinkListener interface.
+  virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE {
+    GetWidget()->Close();
+    ExtensionInstallUI::OpenAppInstalledNTP(browser_, extension_id_);
+  };

[sky, 2011/08/03 22:23:24]

nit: no ;

[asargent_no_longer_on_chrome, 2011/08/04 00:00:16]

oops! Done. 

+
  private:
   virtual gfx::Size GetPreferredSize() {
     int width = kHorizOuterMargin;
@@ -169,8 +194,7 @@ class InstalledBubbleContent : public views::View,
     int height = kVertOuterMargin;
     height += heading_->GetHeightForWidth(kRightColumnWidth);
     height += kVertInnerMargin;
-    if (type_ == ExtensionInstalledBubble::PAGE_ACTION ||
-        type_ == ExtensionInstalledBubble::OMNIBOX_KEYWORD) {
+    if (info_) {
       height += info_->GetHeightForWidth(kRightColumnWidth);
       height += kVertInnerMargin;
     }
@@ -195,8 +219,7 @@ class InstalledBubbleContent : public views::View,
     y += heading_->height();
     y += kVertInnerMargin;
 
-    if (type_ == ExtensionInstalledBubble::PAGE_ACTION ||
-        type_ == ExtensionInstalledBubble::OMNIBOX_KEYWORD) {
+    if (info_) {
       info_->SizeToFit(kRightColumnWidth);
       info_->SetX(x);
       info_->SetY(y);
@@ -220,6 +243,12 @@ class InstalledBubbleContent : public views::View,
     close_button_->SetBounds(x - 1, y - 1, sz.width(), sz.height());
   }
 
+  // The browser we're associated with.
+  Browser* browser_;
+
+  // The id of the extension just installed.
+  std::string extension_id_;

[sky, 2011/08/03 22:23:24]

nit: const

[asargent_no_longer_on_chrome, 2011/08/04 00:00:16]

Done.

+
   // The Bubble showing us.
   Bubble* bubble_;
 
@@ -248,7 +277,9 @@ ExtensionInstalledBubble::ExtensionInstalledBubble(const Extension* extension,
       animation_wait_retries_(0) {
   AddRef();  // Balanced in BubbleClosing.
 
-  if (!extension_->omnibox_keyword().empty()) {
+  if (extension->is_app()) {
+    type_ = APP;
+  } else if (!extension_->omnibox_keyword().empty()) {
     type_ = OMNIBOX_KEYWORD;
   } else if (extension_->browser_action()) {
     type_ = BROWSER_ACTION;
@@ -298,7 +329,16 @@ void ExtensionInstalledBubble::ShowInternal() {
       browser_->window()->GetNativeHandle());
 
   const views::View* reference_view = NULL;
-  if (type_ == BROWSER_ACTION) {
+  if (type_ == APP) {
+    AbstractTabStripView* tabstrip = browser_view->tabstrip();

[sky, 2011/08/03 22:23:24]

There are two cases that are probably worth checking here:
. Is the tabstrip visible? Use browser_view->IsTabStripVisible() to test that.
This is false for things like popups/apps.
. Is the new tab button actually showing (IsVisibleInRootView). Things like
compact nav can make this false.

I don't know what you should do if either of these are false.

[asargent_no_longer_on_chrome, 2011/08/04 00:00:16]

Thanks for pointing this out! I've modified the CL so that if the tab strip
isn't visible, we just fall back to the same general reference view behavior as
extension installs with no UI component (ie no page/browser action, omnibox
hook, etc.) which is to point the bubble at the wrench menu. And if the tab
strip is visible but the new tab button isn't, I have the bubble point at the
tab strip. 

+    if (tabstrip->GetNewTabButton()) {
+      reference_view = tabstrip->GetNewTabButton();
+    } else {
+      // If this tab strip doesn't have a new tab button, just have the bubble
+      // point at the tab strip.
+      reference_view = tabstrip;
+    }
+  } else if (type_ == BROWSER_ACTION) {
     BrowserActionsContainer* container =
         browser_view->GetToolbarView()->browser_actions();
     if (container->animating() &&
@@ -352,7 +392,8 @@ void ExtensionInstalledBubble::ShowInternal() {
     arrow_location = BubbleBorder::TOP_LEFT;
   }
 
-  bubble_content_ = new InstalledBubbleContent(extension_, type_, &icon_);
+  bubble_content_ = new InstalledBubbleContent(
+      browser_, extension_, type_, &icon_);
   Bubble* bubble = Bubble::Show(browser_view->GetWidget(), bounds,
                                 arrow_location, bubble_content_, this);
   bubble_content_->set_bubble(bubble);