[Mac] Make ExtensionPopupController is-a BaseBubbleController to unify code.

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

Index: chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 538c266efabb2bf3efd1cee3d24df01cd72a7bf1..db8da0d0e37cdc4c96ae49c0c2a67286a217eb27 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -119,34 +119,6 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
         anchoredAt:(NSPoint)anchoredAt
      arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation
            devMode:(BOOL)devMode {
-
-  parentWindow_ = parentWindow;
-  anchor_ = [parentWindow convertBaseToScreen:anchoredAt];
-  host_.reset(host);
-  beingInspected_ = devMode;

[Nico, 2012/03/14 21:26:17]

wow

-
-  scoped_nsobject<InfoBubbleView> view([[InfoBubbleView alloc] init]);
-  if (!view.get())
-    return nil;
-  [view setArrowLocation:arrowLocation];
-
-  extensionView_ = host->view()->native_view();
-  container_.reset(new ExtensionPopupContainer(self));
-  host->view()->set_container(container_.get());
-
-  NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
-  [center addObserver:self
-             selector:@selector(extensionViewFrameChanged)
-                 name:NSViewFrameDidChangeNotification
-               object:extensionView_];
-
-  // Watch to see if the parent window closes, and if so, close this one.
-  [center addObserver:self
-             selector:@selector(parentWindowWillClose:)
-                 name:NSWindowWillCloseNotification
-               object:parentWindow_];
-
-  [view addSubview:extensionView_];
   scoped_nsobject<InfoBubbleWindow> window(
       [[InfoBubbleWindow alloc]
           initWithContentRect:NSZeroRect
@@ -155,20 +127,41 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
                         defer:YES]);
   if (!window.get())
     return nil;
-
-  [window setDelegate:self];
-  [window setContentView:view];
-  self = [super initWithWindow:window];
-  if (beingInspected_) {
-    // Listen for the the devtools window closing.
-    notificationBridge_.reset(new DevtoolsNotificationBridge(self));
-    registrar_.reset(new content::NotificationRegistrar);
-    registrar_->Add(notificationBridge_.get(),
-                    content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
-                    content::Source<content::BrowserContext>(host->profile()));
-    registrar_->Add(notificationBridge_.get(),
-                    chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
-                    content::Source<Profile>(host->profile()));
+  anchoredAt = [parentWindow convertBaseToScreen:anchoredAt];
+  if ((self = [super initWithWindow:window
+                       parentWindow:parentWindow
+                         anchoredAt:anchoredAt])) {
+    host_.reset(host);
+    beingInspected_ = devMode;
+
+    InfoBubbleView* view =
+        static_cast<InfoBubbleView*>(self.window.contentView);

[Nico, 2012/03/14 21:26:17]

DCHECK isKindOfClass

[Robert Sesek, 2012/03/14 23:56:41]

Switched to using BaseBubbleController.bubble instead / Done-ish.

+    [view setArrowLocation:arrowLocation];
+
+    extensionView_ = host->view()->native_view();
+    container_.reset(new ExtensionPopupContainer(self));
+    host->view()->set_container(container_.get());
+
+    NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
+    [center addObserver:self
+               selector:@selector(extensionViewFrameChanged)
+                   name:NSViewFrameDidChangeNotification
+                 object:extensionView_];
+
+    [view addSubview:extensionView_];
+
+    if (beingInspected_) {
+      // Listen for the the devtools window closing.
+      notificationBridge_.reset(new DevtoolsNotificationBridge(self));
+      registrar_.reset(new content::NotificationRegistrar);
+      registrar_->Add(notificationBridge_.get(),
+                      content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
+                      content::Source<content::BrowserContext>(
+                          host->profile()));
+      registrar_->Add(notificationBridge_.get(),
+                      chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
+                      content::Source<Profile>(host->profile()));
+    }
   }
   return self;
 }
@@ -177,36 +170,16 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
   DevToolsWindow::OpenDevToolsWindow(host_->render_view_host());
 }
 
-- (void)dealloc {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];

[Nico, 2012/03/14 21:26:17]

Keeping this is probably nicer, since the class still registers itself for a
frame change notification

[Robert Sesek, 2012/03/14 23:56:41]

Done.

-  [super dealloc];
-}
-
-- (void)parentWindowWillClose:(NSNotification*)notification {
-  [self close];
-}
-
 - (void)windowWillClose:(NSNotification *)notification {
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [gPopup autorelease];
+  [super windowWillClose:notification];
   gPopup = nil;
   if (host_->view())
     host_->view()->set_container(NULL);
 }
 
-- (void)windowDidResignKey:(NSNotification *)notification {
-  NSWindow* window = [self window];
-  DCHECK_EQ([notification object], window);
-  // If the window isn't visible, it is already closed, and this notification
-  // has been sent as part of the closing operation, so no need to close.
-  if ([window isVisible] && !beingInspected_) {
-    [self close];
-  }
-}
-
-- (void)close {
-  [[[self window] parentWindow] removeChildWindow:[self window]];
-  [super close];
+- (void)windowDidResignKey:(NSNotification*)notification {
+  if (!beingInspected_)
+    [super windowDidResignKey:notification];
 }
 
 - (BOOL)isClosing {
@@ -291,7 +264,7 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
   frame = [extensionView_ convertRectToBase:frame];
   // Adjust the origin according to the height and width so that the arrow is
   // positioned correctly at the middle and slightly down from the button.
-  NSPoint windowOrigin = anchor_;
+  NSPoint windowOrigin = self.anchorPoint;
   NSSize offsets = NSMakeSize(info_bubble::kBubbleArrowXOffset +
                                   info_bubble::kBubbleArrowWidth / 2.0,
                               info_bubble::kBubbleArrowHeight / 2.0);
@@ -354,16 +327,6 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
   [self onPreferredSizeChanged:pendingPreferredSize_];
 }
 
-// We want this to be a child of a browser window. addChildWindow: (called from
-// this function) will bring the window on-screen; unfortunately,
-// [NSWindowController showWindow:] will also bring it on-screen (but will cause
-// unexpected changes to the window's position). We cannot have an
-// addChildWindow: and a subsequent showWindow:. Thus, we have our own version.
-- (void)showWindow:(id)sender {
-  [parentWindow_ addChildWindow:[self window] ordered:NSWindowAbove];
-  [[self window] makeKeyAndOrderFront:self];
-}
-
 - (void)windowDidResize:(NSNotification*)notification {
   // Let the extension view know, so that it can tell plugins.
   if (host_->view())