Extension Commands: Add [Manage Shortcuts] link to the Extension Install Bubble (Views and GTK only)

chrome/browser/ui/views/extensions/extension_installed_bubble.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/extensions/extension_installed_bubble.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.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/singleton_tabs.h"
 #include "chrome/browser/ui/views/browser_action_view.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/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 55 matching lines @@
   InstalledBubbleContent(Browser* browser,
                          const Extension* extension,
                          ExtensionInstalledBubble::BubbleType type,
                          SkBitmap* icon,
                          ExtensionInstalledBubble* bubble)
       : browser_(browser),
         extension_id_(extension->id()),
         bubble_(bubble),
         type_(type),
         info_(NULL),
-        manage_(NULL) {
+        manage_(NULL),
+       manage_shortcut_(NULL) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const gfx::Font& font = rb.GetFont(ui::ResourceBundle::BaseFont);
 
     // Scale down to 43x43, but allow smaller icons (don't scale up).
     gfx::Size size(icon->width(), icon->height());
     if (size.width() > kIconSize || size.height() > kIconSize)
       size = gfx::Size(kIconSize, kIconSize);
     icon_ = new views::ImageView();
     icon_->SetImageSize(size);
     icon_->SetImage(*icon);
@@ skipping 44 matching lines @@
           has_keybinding = true;
           info_ = new views::Label(l10n_util::GetStringFUTF16(
               IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO_WITH_SHORTCUT,
               browser_action_command.accelerator().GetShortcutText()));
         }
 
         info_->SetFont(font);
         info_->SetMultiLine(true);
         info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
         AddChildView(info_);
+
+        manage_shortcut_ = new views::Link(
+            l10n_util::GetStringUTF16(
+            IDS_EXTENSION_INSTALLED_MANAGE_SHORTCUTS));
         break;
       }
       case ExtensionInstalledBubble::PAGE_ACTION: {
         extensions::CommandService* command_service =
             extensions::CommandServiceFactory::GetForProfile(
                 browser_->profile());
         extensions::Command page_action_command;
         if (!command_service->GetPageActionCommand(
                 extension->id(),
                 extensions::CommandService::ACTIVE_ONLY,
                 &page_action_command,
                 NULL)) {
           info_ = new views::Label(l10n_util::GetStringUTF16(
               IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO));
         } else {
           has_keybinding = true;
           info_ = new views::Label(l10n_util::GetStringFUTF16(
               IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO_WITH_SHORTCUT,
               page_action_command.accelerator().GetShortcutText()));
+          manage_shortcut_ = new views::Link(
+              l10n_util::GetStringUTF16(
+                  IDS_EXTENSION_INSTALLED_MANAGE_SHORTCUTS));
         }
 
         info_->SetFont(font);
         info_->SetMultiLine(true);
         info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
         AddChildView(info_);
         break;
       }
       case ExtensionInstalledBubble::OMNIBOX_KEYWORD: {
         info_ = new views::Label(l10n_util::GetStringFUTF16(
@@ skipping 14 matching lines @@
         manage_->SetMultiLine(true);
         manage_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
         AddChildView(manage_);
         break;
       }
       default:
         break;
     }
 
     if (has_keybinding) {
-      // TODO(finnur): Show the shortcut link.
+      manage_shortcut_->set_listener(this);
+      AddChildView(manage_shortcut_);
     } else if (type_ != ExtensionInstalledBubble::APP) {
       manage_ = new views::Label(
           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,
         rb.GetImageSkiaNamed(IDR_CLOSE_BAR));
     close_button_->SetImage(views::CustomButton::BS_HOT,
         rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));
     close_button_->SetImage(views::CustomButton::BS_PUSHED,
         rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));
     AddChildView(close_button_);
   }
 
   virtual void ButtonPressed(views::Button* sender, const ui::Event& event) {
     if (sender == close_button_)
       bubble_->StartFade(false);
     else
       NOTREACHED() << "Unknown view";
   }
 
   // Implements the views::LinkListener interface.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE {
     GetWidget()->Close();
-    ExtensionInstallUI::OpenAppInstalledUI(browser_, extension_id_);
+    if (source == manage_shortcut_) {
+      std::string configure_url = chrome::kChromeUIExtensionsURL;
+      configure_url += chrome::kExtensionConfigureCommandsSubPage;
+      chrome::NavigateParams params(
+          chrome::GetSingletonTabNavigateParams(
+              browser_, GURL(configure_url.c_str())));
+      chrome::Navigate(&params);
+    } else {
+      ExtensionInstallUI::OpenAppInstalledUI(browser_, extension_id_);
+    }
   }
 
  private:
   virtual gfx::Size GetPreferredSize() {
     int width = kHorizOuterMargin;
     width += kIconSize;
     width += views::kPanelHorizMargin;
     width += kRightColumnWidth;
     width += 2 * views::kPanelHorizMargin;
     width += kHorizOuterMargin;
 
     int height = kVertOuterMargin;
     height += heading_->GetHeightForWidth(kRightColumnWidth);
     height += kVertInnerMargin;
     if (info_) {
       height += info_->GetHeightForWidth(kRightColumnWidth);
       height += kVertInnerMargin;
     }
 
     if (manage_) {
       height += manage_->GetHeightForWidth(kRightColumnWidth);
       height += kVertOuterMargin;
     }
 
+    if (manage_shortcut_) {
+      height += manage_shortcut_->GetHeightForWidth(kRightColumnWidth);
+      height += kVertOuterMargin;
+    }
+
     return gfx::Size(width, std::max(height, kIconSize + 2 * kVertOuterMargin));
   }
 
   virtual void Layout() {
     int x = kHorizOuterMargin;
     int y = kVertOuterMargin;
 
     icon_->SetBounds(x, y, kIconSize, kIconSize);
     x += kIconSize;
     x += views::kPanelHorizMargin;
@@ skipping 14 matching lines @@
     }
 
     if (manage_) {
       manage_->SizeToFit(kRightColumnWidth);
       manage_->SetX(x);
       manage_->SetY(y);
       y += manage_->height();
       y += kVertInnerMargin;
     }
 
+    if (manage_shortcut_) {
+      gfx::Size sz = manage_shortcut_->GetPreferredSize();
+      manage_shortcut_->SetBounds(width() - 2 * kHorizOuterMargin - sz.width(),
+                                  y,
+                                  sz.width(),
+                                  sz.height());
+      y += manage_shortcut_->height();
+      y += kVertInnerMargin;
+    }
+
     gfx::Size sz;
     x += kRightColumnWidth + 2 * views::kPanelHorizMargin + kHorizOuterMargin -
         close_button_->GetPreferredSize().width();
     y = kVertOuterMargin;
     sz = close_button_->GetPreferredSize();
     // x-1 & y-1 is just slop to get the close button visually aligned with the
     // title text and bubble arrow.
     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.
   const std::string extension_id_;
 
   // The ExtensionInstalledBubble showing us.
   ExtensionInstalledBubble* bubble_;
 
   ExtensionInstalledBubble::BubbleType type_;
   views::ImageView* icon_;
   views::Label* heading_;
   views::Label* info_;
   views::Label* manage_;
+  views::Link* manage_shortcut_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(InstalledBubbleContent);
 };
 
 void ExtensionInstalledBubble::Show(const Extension* extension,
                                     Browser *browser,
                                     const SkBitmap& icon) {
   new ExtensionInstalledBubble(extension, browser, icon);
 }
@@ skipping 133 matching lines @@
 }
 
 void ExtensionInstalledBubble::WindowClosing() {
   if (extension_ && type_ == PAGE_ACTION) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extension_->page_action(),
         false);  // preview_enabled
   }
 }