[Extensions UI Mac] Wire up Mac to use the ExtensionInstalledBubble

chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h"
 
 #include "base/i18n/rtl.h"
 #include "base/mac/bundle_locations.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #include "chrome/browser/ui/cocoa/hover_close_button.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/new_tab_button.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/extensions/extension_install_ui_factory.h"
+#include "chrome/browser/ui/extensions/extension_installed_bubble.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "chrome/common/extensions/api/extension_action/action_info.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 "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/install/extension_install_ui.h"
 #include "extensions/common/extension.h"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using extensions::BundleInstaller;
 using extensions::Extension;
 using extensions::UnloadedExtensionInfo;
 
-// C++ class that receives EXTENSION_LOADED notifications and proxies them back
-// to |controller|.
-class ExtensionLoadedNotificationObserver
-    : public content::NotificationObserver {
+class ExtensionInstalledBubbleBridge
+    : public ExtensionInstalledBubble::Delegate {
  public:
-  ExtensionLoadedNotificationObserver(
-      ExtensionInstalledBubbleController* controller, Profile* profile)
-          : controller_(controller) {
-    registrar_.Add(this,
-                   extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                   content::Source<Profile>(profile));
-    registrar_.Add(this,
-                   extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                   content::Source<Profile>(profile));
-  }
+  ExtensionInstalledBubbleBridge(

[Robert Sesek, 2015/02/12 23:47:35]

explicit

[Devlin, 2015/02/13 01:11:50]

I forget how dependent I am on presubmit checks sometimes.... Done.

+      ExtensionInstalledBubbleController* controller);
+  ~ExtensionInstalledBubbleBridge() override;
 
  private:
-  // NotificationObserver implementation. Tells the controller to start showing
-  // its window on the main thread when the extension has finished loading.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override {
-    if (type == extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED) {
-      const Extension* extension =
-          content::Details<const Extension>(details).ptr();
-      if (extension == [controller_ extension]) {
-        [controller_ performSelectorOnMainThread:@selector(showWindow:)
-                                      withObject:controller_
-                                   waitUntilDone:NO];
-      }
-    } else if (type == extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED) {
-      const Extension* extension =
-          content::Details<const UnloadedExtensionInfo>(details)->extension;
-      if (extension == [controller_ extension]) {
-        [controller_ performSelectorOnMainThread:@selector(extensionUnloaded:)
-                                      withObject:controller_
-                                   waitUntilDone:NO];
-      }
-    } else {
-      NOTREACHED() << "Received unexpected notification.";
-    }
-  }
+  // ExtensionInstalledBubble::Delegate:
+  bool MaybeShowNow() override;
 
-  content::NotificationRegistrar registrar_;
-  ExtensionInstalledBubbleController* controller_;  // weak, owns us
+  // The (owning) installed bubble controller.
+  ExtensionInstalledBubbleController* controller_;
 };

[Robert Sesek, 2015/02/12 23:47:35]

DISALLOW_COPY_AND_ASSIGN

[Devlin, 2015/02/13 01:11:50]

Done.

 
+ExtensionInstalledBubbleBridge::ExtensionInstalledBubbleBridge(
+    ExtensionInstalledBubbleController* controller)
+    : controller_(controller) {
+}
+
+ExtensionInstalledBubbleBridge::~ExtensionInstalledBubbleBridge() {
+}
+
+bool ExtensionInstalledBubbleBridge::MaybeShowNow() {
+  [controller_ showWindow:controller_];
+  return true;
+}
+
 @implementation ExtensionInstalledBubbleController
 
-@synthesize extension = extension_;
 @synthesize bundle = bundle_;
 // Exposed for unit test.
 @synthesize pageActionPreviewShowing = pageActionPreviewShowing_;
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                  extension:(const Extension*)extension
                     bundle:(const BundleInstaller*)bundle
                    browser:(Browser*)browser
                       icon:(SkBitmap)icon {
   NSString* nibName = bundle ? @"ExtensionInstalledBubbleBundle" :
                                @"ExtensionInstalledBubble";
   if ((self = [super initWithWindowNibPath:nibName
                               parentWindow:parentWindow
                                 anchoredAt:NSZeroPoint])) {
-    extension_ = extension;
     bundle_ = bundle;
     DCHECK(browser);
     browser_ = browser;
     icon_.reset([gfx::SkBitmapToNSImage(icon) retain]);
     pageActionPreviewShowing_ = NO;
 
     if (bundle_) {
       type_ = extension_installed_bubble::kBundle;
     } else if (extension->is_app()) {
       type_ = extension_installed_bubble::kApp;
     } else if (!extensions::OmniboxInfo::GetKeyword(extension).empty()) {
       type_ = extension_installed_bubble::kOmniboxKeyword;
     } else if (extensions::ActionInfo::GetBrowserActionInfo(extension)) {
       type_ = extension_installed_bubble::kBrowserAction;
     } else if (extensions::ActionInfo::GetPageActionInfo(extension) &&
                extensions::ActionInfo::IsVerboseInstallMessage(extension)) {
       type_ = extension_installed_bubble::kPageAction;
     } else {
       type_ = extension_installed_bubble::kGeneric;
     }
 
     if (type_ == extension_installed_bubble::kBundle) {
       [self showWindow:self];
     } else {
       // Start showing window only after extension has fully loaded.
-      extensionObserver_.reset(new ExtensionLoadedNotificationObserver(
-          self, browser->profile()));
+      installedBubbleBridge_.reset(new ExtensionInstalledBubbleBridge(self));
+      installedBubble_.reset(new ExtensionInstalledBubble(
+          installedBubbleBridge_.get(),
+          extension,
+          browser,
+          icon));
+      installedBubble_->IgnoreBrowserClosing();
     }
   }
   return self;
 }
 
+- (const Extension*)extension {
+  return installedBubble_->extension();
+}
+
 // Sets |promo_| based on |promoPlaceholder_|, sets |promoPlaceholder_| to nil.
 - (void)initializeLabel {
  // Replace the promo placeholder NSTextField with the real label NSTextView.
  // The former doesn't show links in a nice way, but the latter can't be added
  // in IB without a containing scroll view, so create the NSTextView
  // programmatically.
  promo_.reset([[HyperlinkTextView alloc]
      initWithFrame:[promoPlaceholder_ frame]]);
  [promo_.get() setAutoresizingMask:[promoPlaceholder_ autoresizingMask]];
  [[promoPlaceholder_ superview]
      replaceSubview:promoPlaceholder_ with:promo_.get()];
  promoPlaceholder_ = nil;  // Now released.
  [promo_.get() setDelegate:self];
 }
 
 // Returns YES if the sync promo should be shown in the bubble.
 - (BOOL)showSyncPromo {
-  return extensions::sync_helper::IsSyncableExtension(extension_) &&
-         SyncPromoUI::ShouldShowSyncPromo(browser_->profile());
+  return extensions::sync_helper::IsSyncableExtension([self extension]) &&
+      SyncPromoUI::ShouldShowSyncPromo(browser_->profile());
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   // Turn off page action icon preview when the window closes, unless we
   // already removed it when the window resigned key status.
   [self removePageActionPreviewIfNecessary];
-  extension_ = NULL;
   browser_ = NULL;
   [closeButton_ setTrackingEnabled:NO];
   [super windowWillClose:notification];
 }
 
 // The controller is the delegate of the window, so it receives "did resign
 // key" notifications.  When key is resigned, close the window.
 - (void)windowDidResignKey:(NSNotification*)notification {
   // If the browser window is closing, we need to remove the page action
   // immediately, otherwise the closing animation may overlap with
@@ skipping 11 matching lines @@
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
   DCHECK_EQ(promo_.get(), aTextView);
   chrome::ShowBrowserSignin(browser_,
                             signin_metrics::SOURCE_EXTENSION_INSTALL_BUBBLE);
   return YES;
 }
 
 // Extracted to a function here so that it can be overridden for unit testing.
 - (void)removePageActionPreviewIfNecessary {
-  if (!extension_ || !pageActionPreviewShowing_)
+  if (![self extension] || !pageActionPreviewShowing_)
     return;
   ExtensionAction* page_action =
       extensions::ExtensionActionManager::Get(browser_->profile())->
-      GetPageAction(*extension_);
+      GetPageAction(*[self extension]);
   if (!page_action)
     return;
   pageActionPreviewShowing_ = NO;
 
   BrowserWindowCocoa* window =
       static_cast<BrowserWindowCocoa*>(browser_->window());
   LocationBarViewMac* locationBarView =
       [window->cocoa_controller() locationBarBridge];
   locationBarView->SetPreviewEnabledPageAction(page_action,
                                                false);  // disables preview.
@@ skipping 24 matching lines @@
     case extension_installed_bubble::kOmniboxKeyword: {
       LocationBarViewMac* locationBarView =
           [window->cocoa_controller() locationBarBridge];
       arrowPoint = locationBarView->GetPageInfoBubblePoint();
       break;
     }
     case extension_installed_bubble::kBrowserAction: {
       BrowserActionsController* controller =
           [[window->cocoa_controller() toolbarController]
               browserActionsController];
-      arrowPoint = [controller popupPointForId:extension_->id()];
+      arrowPoint = [controller popupPointForId:[self extension]->id()];
       break;
     }
     case extension_installed_bubble::kPageAction: {
       LocationBarViewMac* locationBarView =
           [window->cocoa_controller() locationBarBridge];
 
       ExtensionAction* page_action =
           extensions::ExtensionActionManager::Get(browser_->profile())->
-          GetPageAction(*extension_);
+          GetPageAction(*[self extension]);
 
       // Tell the location bar to show a preview of the page action icon, which
       // would ordinarily only be displayed on a page of the appropriate type.
       // We remove this preview when the extension installed bubble closes.
       locationBarView->SetPreviewEnabledPageAction(page_action, true);
       pageActionPreviewShowing_ = YES;
 
       // Find the center of the bottom of the page action icon.
       arrowPoint =
           locationBarView->GetPageActionBubblePoint(page_action);
@@ skipping 63 matching lines @@
   }
   [iconImage_ setImage:icon_];
   [iconImage_ setNeedsDisplay:YES];
   return window;
 }
 
 - (bool)hasActivePageAction:(extensions::Command*)command {
   extensions::CommandService* command_service =
       extensions::CommandService::Get(browser_->profile());
   if (type_ == extension_installed_bubble::kPageAction) {
-    if (extensions::CommandsInfo::GetPageActionCommand(extension_) &&
+    if (extensions::CommandsInfo::GetPageActionCommand([self extension]) &&
         command_service->GetPageActionCommand(
-            extension_->id(),
+            [self extension]->id(),
             extensions::CommandService::ACTIVE,
             command,
             NULL)) {
       return true;
     }
   }
 
   return false;
 }
 
 - (bool)hasActiveBrowserAction:(extensions::Command*)command {
   extensions::CommandService* command_service =
       extensions::CommandService::Get(browser_->profile());
   if (type_ == extension_installed_bubble::kBrowserAction) {
-    if (extensions::CommandsInfo::GetBrowserActionCommand(extension_) &&
+    if (extensions::CommandsInfo::GetBrowserActionCommand([self extension]) &&
         command_service->GetBrowserActionCommand(
-            extension_->id(),
+            [self extension]->id(),
             extensions::CommandService::ACTIVE,
             command,
             NULL)) {
       return true;
     }
   }
 
   return false;
 }
 
@@ skipping 74 matching lines @@
     // it with text (it tells you it is single-line even if it is multiline), so
     // here the hidden howToUse_ TextField is temporarily repurposed to
     // calculate the correct height for the TextView.
     [[howToUse_ cell] setAttributedStringValue:[promo_ attributedString]];
     [GTMUILocalizerAndLayoutTweaker
           sizeToFitFixedWidthTextField:howToUse_];
     sync_promo_height = NSHeight([howToUse_ frame]);
   }
 
   // First part of extension installed message, the heading.
-  base::string16 extension_name = base::UTF8ToUTF16(extension_->name().c_str());
+  base::string16 extension_name =
+      base::UTF8ToUTF16([self extension]->name().c_str());
   base::i18n::AdjustStringForLocaleDirection(&extension_name);
   [heading_ setStringValue:l10n_util::GetNSStringF(
       IDS_EXTENSION_INSTALLED_HEADING, extension_name)];
   [GTMUILocalizerAndLayoutTweaker
       sizeToFitFixedWidthTextField:heading_];
   newWindowHeight += NSHeight([heading_ frame]) +
       extension_installed_bubble::kInnerVerticalMargin;
 
   // If type is browser/page action, include a special message about them.
   if (type_ == extension_installed_bubble::kBrowserAction ||
       type_ == extension_installed_bubble::kPageAction) {
     [howToUse_ setStringValue:[self
         installMessageForCurrentExtensionAction]];
     [howToUse_ setHidden:NO];
     [[howToUse_ cell]
         setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [GTMUILocalizerAndLayoutTweaker
         sizeToFitFixedWidthTextField:howToUse_];
     newWindowHeight += NSHeight([howToUse_ frame]) +
         extension_installed_bubble::kInnerVerticalMargin;
   }
 
   // If type is omnibox keyword, include a special message about the keyword.
   if (type_ == extension_installed_bubble::kOmniboxKeyword) {
     [howToUse_ setStringValue:l10n_util::GetNSStringF(
         IDS_EXTENSION_INSTALLED_OMNIBOX_KEYWORD_INFO,
-        base::UTF8ToUTF16(extensions::OmniboxInfo::GetKeyword(extension_)))];
+        base::UTF8ToUTF16(extensions::OmniboxInfo::GetKeyword(
+            [self extension])))];
     [howToUse_ setHidden:NO];
     [[howToUse_ cell]
         setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [GTMUILocalizerAndLayoutTweaker
         sizeToFitFixedWidthTextField:howToUse_];
     newWindowHeight += NSHeight([howToUse_ frame]) +
         extension_installed_bubble::kInnerVerticalMargin;
   }
 
   // If type is app, hide howToManage_, and include a "show me" link in the
@@ skipping 102 matching lines @@
     return;
   }
 
   NSRect headingFrame = [heading_ frame];
   headingFrame.origin.y = newWindowHeight - (
       NSHeight(headingFrame) +
       extension_installed_bubble::kOuterVerticalMargin);
   [heading_ setFrame:headingFrame];
 
   NSRect howToManageFrame = [howToManage_ frame];
-  if (!extensions::OmniboxInfo::GetKeyword(extension_).empty() ||
-      extensions::ActionInfo::GetBrowserActionInfo(extension_) ||
-      extensions::ActionInfo::IsVerboseInstallMessage(extension_)) {
+  if (!extensions::OmniboxInfo::GetKeyword([self extension]).empty() ||
+      extensions::ActionInfo::GetBrowserActionInfo([self extension]) ||
+      extensions::ActionInfo::IsVerboseInstallMessage([self extension])) {
     // For browser actions, page actions and omnibox keyword show the
     // 'how to use' message before the 'how to manage' message.
     NSRect howToUseFrame = [howToUse_ frame];
     howToUseFrame.origin.y = headingFrame.origin.y - (
         NSHeight(howToUseFrame) +
         extension_installed_bubble::kInnerVerticalMargin);
     [howToUse_ setFrame:howToUseFrame];
 
     howToManageFrame.origin.y = howToUseFrame.origin.y - (
         NSHeight(howToManageFrame) +
@@ skipping 40 matching lines @@
 }
 
 - (NSRect)frameOfSigninPromo {
   return [promo_ frame];
 }
 
 - (NSButton*)appInstalledShortcutLink {
   return appShortcutLink_;
 }
 
-- (void)extensionUnloaded:(id)sender {
-  extension_ = NULL;
-}
-
 - (IBAction)onManageShortcutClicked:(id)sender {
   [self close];
   std::string configure_url = chrome::kChromeUIExtensionsURL;
   configure_url += chrome::kExtensionConfigureCommandsSubPage;
   chrome::NavigateParams params(chrome::GetSingletonTabNavigateParams(
       browser_, GURL(configure_url)));
   chrome::Navigate(&params);
 }
 
 - (IBAction)onAppShortcutClicked:(id)sender {
   scoped_ptr<extensions::ExtensionInstallUI> install_ui(
       extensions::CreateExtensionInstallUI(browser_->profile()));
-  install_ui->OpenAppInstalledUI(extension_->id());
+  install_ui->OpenAppInstalledUI([self extension]->id());
 }
 
 - (void)awakeFromNib {
   if (bundle_)
     return;
   [self initializeLabel];
 }
 
 @end