[Extensions UI] Share more code in ExtensionInstalledBubble

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

 // Copyright 2013 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_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.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/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
-#include "chrome/common/extensions/api/omnibox/omnibox_handler.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_elider.h"
@@ skipping 40 matching lines @@
 
 }  // namespace chrome
 
 // InstalledBubbleContent is the content view which is placed in the
 // ExtensionInstalledBubbleView. It displays the install icon and explanatory
 // text about the installed extension.
 class InstalledBubbleContent : public views::View,
                                public views::ButtonListener,
                                public views::LinkListener {
  public:
-  InstalledBubbleContent(Browser* browser,
-                         const Extension* extension,
-                         ExtensionInstalledBubble::BubbleType type,
-                         const SkBitmap* icon);
+  InstalledBubbleContent(const ExtensionInstalledBubble& bubble,
+                         Browser* browser);
 
   // Overridden from views::ButtonListener.
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // Overriden from views::LinkListener.
   void LinkClicked(views::Link* source, int event_flags) override;
 
  private:
   enum Flavors {
     NONE            = 0,
     HOW_TO_USE      = 1 << 0,
     HOW_TO_MANAGE   = 1 << 1,
     SHOW_KEYBINDING = 1 << 2,
     SIGN_IN_PROMO   = 1 << 3,
   };
 
-  bool GetKeybinding(extensions::Command* command);
-  base::string16 GetHowToUseDescription(const base::string16& key);
-
   // Layout the signin promo at coordinates |offset_x| and |offset_y|. Returns
   // the height (in pixels) of the promo UI.
   int LayoutSigninPromo(int offset_x, int offset_y);
 
   // Overriden from views::View.
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // The browser we're associated with.
   Browser* browser_;
 
-  // The id of the extension just installed.
-  const std::string extension_id_;
-
   // The string that contains the link text at the beginning of the sign-in
   // promo text.
   base::string16 signin_promo_link_text_;
   // The remaining text of the sign-in promo text.
   base::string16 signin_promo_text_;
 
   // A vector of RenderText objects representing the full sign-in promo
   // paragraph as layed out within the bubble, but has the text of the link
   // whited out so the link can be drawn in its place.
   ScopedVector<gfx::RenderText> sign_in_promo_lines_;
 
-  // The type of the bubble to show (Browser Action, Omnibox keyword, etc).
-  ExtensionInstalledBubble::BubbleType type_;
-
   // A bitmask containing the various flavors of bubble sections to show.
   int flavors_;
 
   // The height, in pixels, of the sign-in promo.
   size_t height_of_signin_promo_;
 
   views::ImageView* icon_;
   views::Label* heading_;
   views::Label* how_to_use_;
   views::Link* sign_in_link_;
   views::Label* manage_;
   views::Link* manage_shortcut_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(InstalledBubbleContent);
 };
 
 InstalledBubbleContent::InstalledBubbleContent(
-    Browser* browser,
-    const Extension* extension,
-    ExtensionInstalledBubble::BubbleType type,
-    const SkBitmap* icon)
+    const ExtensionInstalledBubble& bubble,
+    Browser* browser)
     : browser_(browser),
-      extension_id_(extension->id()),
-      type_(type),
       flavors_(NONE),
       height_of_signin_promo_(0u),
       how_to_use_(NULL),
       sign_in_link_(NULL),
       manage_(NULL),
       manage_shortcut_(NULL) {
   // The Extension Installed bubble takes on various forms, depending on the
   // type of extension installed. In general, though, they are all similar:
   //
   // -------------------------
   // |      | Heading    [X] |
   // | Icon | Info           |
   // |      | Extra info     |
   // -------------------------
   //
   // Icon and Heading are always shown (as well as the close button).
   // Info is shown for browser actions, page actions and Omnibox keyword
   // extensions and might list keyboard shorcut for the former two types.
   // Extra info is...
   // ... for other types, either a description of how to manage the extension
   //     or a link to configure the keybinding shortcut (if one exists).
   // Extra info can include a promo for signing into sync.
 
-  // First figure out the keybinding situation.
-  extensions::Command command;
-  bool has_keybinding = GetKeybinding(&command);
-  base::string16 key;  // Keyboard shortcut or keyword to display in bubble.
-
+  const Extension* extension = bubble.extension();
   if (extensions::sync_helper::IsSyncableExtension(extension) &&
       SyncPromoUI::ShouldShowSyncPromo(browser->profile()))
     flavors_ |= SIGN_IN_PROMO;
 
   // Determine the bubble flavor we want, based on the extension type.
-  switch (type_) {
+  switch (bubble.type()) {
     case ExtensionInstalledBubble::BROWSER_ACTION:
-    case ExtensionInstalledBubble::PAGE_ACTION: {
+    case ExtensionInstalledBubble::PAGE_ACTION:
       flavors_ |= HOW_TO_USE;
-      if (has_keybinding) {
+      if (bubble.has_command_keybinding()) {
         flavors_ |= SHOW_KEYBINDING;
-        key = command.accelerator().GetShortcutText();
       } else {
         // The How-To-Use text makes the bubble seem a little crowded when the
         // extension has a keybinding, so the How-To-Manage text is not shown
         // in those cases.
         flavors_ |= HOW_TO_MANAGE;
       }
       break;
-    }
-    case ExtensionInstalledBubble::OMNIBOX_KEYWORD: {
+    case ExtensionInstalledBubble::OMNIBOX_KEYWORD:
       flavors_ |= HOW_TO_USE | HOW_TO_MANAGE;
-      key = base::UTF8ToUTF16(extensions::OmniboxInfo::GetKeyword(extension));
       break;
-    }
-    case ExtensionInstalledBubble::GENERIC: {
+    case ExtensionInstalledBubble::GENERIC:
       break;
-    }
-    default: {
+    default:
       // When adding a new bubble type, the flavor needs to be set.
       static_assert(ExtensionInstalledBubble::GENERIC == 3,
           "kBubbleType enum has changed, this switch statement must "
           "be updateed");
       break;
-    }
   }
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::FontList& font_list =
       rb.GetFontList(ui::ResourceBundle::BaseFont);
 
+  const SkBitmap& icon = bubble.icon();
   // Add the icon (for all flavors).
   // Scale down to 43x43, but allow smaller icons (don't scale up).
-  gfx::Size size(icon->width(), icon->height());
+  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(gfx::ImageSkia::CreateFrom1xBitmap(*icon));
+  icon_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(icon));
   AddChildView(icon_);
 
   // Add the heading (for all flavors).
   base::string16 extension_name = base::UTF8ToUTF16(extension->name());
   base::i18n::AdjustStringForLocaleDirection(&extension_name);
   heading_ = new views::Label(l10n_util::GetStringFUTF16(
       IDS_EXTENSION_INSTALLED_HEADING, extension_name));
   heading_->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   heading_->SetMultiLine(true);
   heading_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(heading_);
 
   if (flavors_ & HOW_TO_USE) {
-    how_to_use_ = new views::Label(GetHowToUseDescription(key));
+    how_to_use_ = new views::Label(bubble.GetHowToUseDescription());
     how_to_use_->SetFontList(font_list);
     how_to_use_->SetMultiLine(true);
     how_to_use_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(how_to_use_);
   }
 
   if (flavors_ & SHOW_KEYBINDING) {
     manage_shortcut_ = new views::Link(
         l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALLED_MANAGE_SHORTCUTS));
     manage_shortcut_->set_listener(this);
@@ skipping 49 matching lines @@
 
   DCHECK_EQ(manage_shortcut_, source);
 
   std::string configure_url = chrome::kChromeUIExtensionsURL;
   configure_url += chrome::kExtensionConfigureCommandsSubPage;
   chrome::NavigateParams params(chrome::GetSingletonTabNavigateParams(
       browser_, GURL(configure_url)));
   chrome::Navigate(&params);
 }
 
-bool InstalledBubbleContent::GetKeybinding(extensions::Command* command) {
-  extensions::CommandService* command_service =
-      extensions::CommandService::Get(browser_->profile());
-  if (type_ == ExtensionInstalledBubble::BROWSER_ACTION) {
-    return command_service->GetBrowserActionCommand(
-        extension_id_,
-        extensions::CommandService::ACTIVE,
-        command,
-        NULL);
-  } else if (type_ == ExtensionInstalledBubble::PAGE_ACTION) {
-    return command_service->GetPageActionCommand(
-        extension_id_,
-        extensions::CommandService::ACTIVE,
-        command,
-        NULL);
-  } else {
-    return false;
-  }
-}
-
-base::string16 InstalledBubbleContent::GetHowToUseDescription(
-    const base::string16& key) {
-  switch (type_) {
-    case ExtensionInstalledBubble::BROWSER_ACTION:
-      if (!key.empty()) {
-        return l10n_util::GetStringFUTF16(
-            IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO_WITH_SHORTCUT, key);
-      } else {
-        return l10n_util::GetStringUTF16(
-            IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO);
-      }
-      break;
-    case ExtensionInstalledBubble::PAGE_ACTION:
-      if (!key.empty()) {
-        return l10n_util::GetStringFUTF16(
-            IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO_WITH_SHORTCUT, key);
-      } else {
-        return l10n_util::GetStringUTF16(
-            IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO);
-      }
-      break;
-    case ExtensionInstalledBubble::OMNIBOX_KEYWORD:
-      return l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO, key);
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-  return base::string16();
-}
-
 int InstalledBubbleContent::LayoutSigninPromo(int offset_x, int offset_y) {
   sign_in_promo_lines_.clear();
   int height = 0;
   gfx::Rect contents_area = GetContentsBounds();
   if (contents_area.IsEmpty())
     return height;
   contents_area.set_width(kRightColumnWidth);
 
   base::string16 full_text = signin_promo_link_text_ + signin_promo_text_;
 
@@ skipping 191 matching lines @@
 
   // Default case.
   if (reference_view == NULL)
     reference_view = browser_view->GetToolbarView()->app_menu();
   SetAnchorView(reference_view);
 
   set_arrow(bubble_.type() == bubble_.OMNIBOX_KEYWORD ?
             views::BubbleBorder::TOP_LEFT :
             views::BubbleBorder::TOP_RIGHT);
   SetLayoutManager(new views::FillLayout());
-  AddChildView(new InstalledBubbleContent(
-      bubble_.browser(), bubble_.extension(), bubble_.type(),
-      &bubble_.icon()));
+  AddChildView(new InstalledBubbleContent(bubble_, bubble_.browser()));
 
   views::BubbleDelegateView::CreateBubble(this)->Show();
 
   // The bubble widget is now the parent and owner of |this| and takes care of
   // deletion when the bubble or browser go away.
   bubble_.IgnoreBrowserClosing();
 
   return true;
 }
 
@@ skipping 14 matching lines @@
   if (bubble_.extension() && bubble_.type() == bubble_.PAGE_ACTION &&
       !extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     BrowserView* browser_view =
         BrowserView::GetBrowserViewForBrowser(bubble_.browser());
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extensions::ExtensionActionManager::Get(bubble_.browser()->profile())->
         GetPageAction(*bubble_.extension()),
         false);  // preview_enabled
   }
 }