[Mac] Make ExtensionInstalledBubbleController is-a BaseBubbleController.

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/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 74 matching lines @@
 @synthesize bundle = bundle_;
 @synthesize pageActionRemoved = pageActionRemoved_;  // Exposed for unit test.
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                  extension:(const Extension*)extension
                     bundle:(const BundleInstaller*)bundle
                    browser:(Browser*)browser
                       icon:(SkBitmap)icon {
   NSString* nibName = bundle ? @"ExtensionInstalledBubbleBundle" :
                                @"ExtensionInstalledBubble";
-  NSString* nibPath = [base::mac::FrameworkBundle() pathForResource:nibName
-                                                             ofType:@"nib"];
-  if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
-    DCHECK(parentWindow);
-    parentWindow_ = parentWindow;
+  if ((self = [super initWithWindowNibPath:nibName
+                              parentWindow:parentWindow
+                                anchoredAt:NSZeroPoint])) {
     extension_ = extension;
     bundle_ = bundle;
     DCHECK(browser);
     browser_ = browser;
     icon_.reset([gfx::SkBitmapToNSImage(icon) retain]);
     pageActionRemoved_ = NO;
 
     if (bundle_) {
       type_ = extension_installed_bubble::kBundle;
     } else if (!extension->omnibox_keyword().empty()) {
       type_ = extension_installed_bubble::kOmniboxKeyword;
     } else if (extension->browser_action()) {
       type_ = extension_installed_bubble::kBrowserAction;
     } else if (extension->page_action() &&
                !extension->page_action()->default_icon_path().empty()) {
       type_ = extension_installed_bubble::kPageAction;
     } else {
       NOTREACHED();  // kGeneric installs handled in the extension_install_ui.
     }
 
     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()));
     }
-
-    // Watch to see if the parent window closes, and if so, close this one.
-    NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
-    [center addObserver:self
-               selector:@selector(parentWindowWillClose:)
-                   name:NSWindowWillCloseNotification
-                 object:parentWindow_];
   }
   return self;
 }
 
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [super dealloc];
-}
-
-- (void)close {
-  [[[self window] parentWindow] removeChildWindow:[self window]];
-  [super close];
-}
-
-- (void)parentWindowWillClose:(NSNotification*)notification {
-  [self close];
-}
-
 - (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;
-  parentWindow_ = nil;
-  // We caught a close so we don't need to watch for the parent closing.
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [self autorelease];
+
+  [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 {
-  NSWindow* window = [self window];
-  DCHECK_EQ([notification object], window);
-  DCHECK([window isVisible]);
-
   // If the browser window is closing, we need to remove the page action
   // immediately, otherwise the closing animation may overlap with
   // browser destruction.
   [self removePageActionPreviewIfNecessary];
-  [self close];
+  [super windowDidResignKey:notification];
 }
 
 - (IBAction)closeWindow:(id)sender {
   DCHECK([[self window] isVisible]);
   [self close];
 }
 
 // Extracted to a function here so that it can be overwritten for unit
 // testing.
 - (void)removePageActionPreviewIfNecessary {
@@ skipping 71 matching lines @@
 // position).  We cannot have an addChildWindow: and a subsequent
 // showWindow:. Thus, we have our own version.
 - (void)showWindow:(id)sender {
   // Generic extensions get an infobar rather than a bubble.
   DCHECK(type_ != extension_installed_bubble::kGeneric);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Load nib and calculate height based on messages to be shown.
   NSWindow* window = [self initializeWindow];
   int newWindowHeight = [self calculateWindowHeight];
-  [infoBubbleView_ setFrameSize:NSMakeSize(
+  [self.bubble setFrameSize:NSMakeSize(
       NSWidth([[window contentView] bounds]), newWindowHeight)];
   NSSize windowDelta = NSMakeSize(
       0, newWindowHeight - NSHeight([[window contentView] bounds]));
   windowDelta = [[window contentView] convertSize:windowDelta toView:nil];
   NSRect newFrame = [window frame];
   newFrame.size.height += windowDelta.height;
   [window setFrame:newFrame display:NO];
 
   // Now that we have resized the window, adjust y pos of the messages.
   [self setMessageFrames:newWindowHeight];
 
   // Find window origin, taking into account bubble size and arrow location.
-  NSPoint origin =
-      [parentWindow_ convertBaseToScreen:[self calculateArrowPoint]];
-  NSSize offsets = NSMakeSize(info_bubble::kBubbleArrowXOffset +
-                              info_bubble::kBubbleArrowWidth / 2.0, 0);
-  offsets = [[window contentView] convertSize:offsets toView:nil];
-  if ([infoBubbleView_ arrowLocation] == info_bubble::kTopRight)
-    origin.x -= NSWidth([window frame]) - offsets.width;
-  origin.y -= NSHeight([window frame]);
-  [window setFrameOrigin:origin];
-
-  [parentWindow_ addChildWindow:window
-                        ordered:NSWindowAbove];
-  [window makeKeyAndOrderFront:self];
+  self.anchorPoint =

[Nico, 2012/03/14 23:59:46]

bleh, property syntax for nontrivial setters :-/

+      [self.parentWindow convertBaseToScreen:[self calculateArrowPoint]];
+  [super showWindow:sender];
 }
 
 // Finish nib loading, set arrow location and load icon into window.  This
 // function is exposed for unit testing.
 - (NSWindow*)initializeWindow {
   NSWindow* window = [self window];  // completes nib load
 
   if (type_ == extension_installed_bubble::kOmniboxKeyword) {
-    [infoBubbleView_ setArrowLocation:info_bubble::kTopLeft];
+    [self.bubble setArrowLocation:info_bubble::kTopLeft];
   } else {
-    [infoBubbleView_ setArrowLocation:info_bubble::kTopRight];
+    [self.bubble setArrowLocation:info_bubble::kTopRight];
   }
 
   if (type_ == extension_installed_bubble::kBundle)
     return window;
 
   // Set appropriate icon, resizing if necessary.
   if ([icon_ size].width > extension_installed_bubble::kIconSize) {
     [icon_ setSize:NSMakeSize(extension_installed_bubble::kIconSize,
                               extension_installed_bubble::kIconSize)];
   }
@@ skipping 178 matching lines @@
 
 - (NSRect)getExtensionInstalledInfoMsgFrame {
   return [extensionInstalledInfoMsg_ frame];
 }
 
 - (void)extensionUnloaded:(id)sender {
   extension_ = NULL;
 }
 
 @end