Move extension pop-ups and notifications to the new auto-resize code.

chrome/browser/ui/cocoa/extensions/extension_popup_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_popup_controller.h"
 
 #include <algorithm>
 
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 30 matching lines @@
 // NOTE: This takes ownership of |host|.
 - (id)initWithHost:(ExtensionHost*)host
       parentWindow:(NSWindow*)parentWindow
         anchoredAt:(NSPoint)anchoredAt
      arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation
            devMode:(BOOL)devMode;
 
 // Called when the extension's hosted NSView has been resized.
 - (void)extensionViewFrameChanged;
 
-// Called when the extension's preferred size changes.
-- (void)onPreferredSizeChanged:(NSSize)newSize;
+// Called when the extension's size changes.
+- (void)onSizeChanged:(NSSize)newSize;
 
 // Called when the extension view is shown.
 - (void)onViewDidShow;
 @end
 
 class ExtensionPopupContainer : public ExtensionViewMac::Container {
  public:
   explicit ExtensionPopupContainer(ExtensionPopupController* controller)
       : controller_(controller) {
   }
 
-  virtual void OnExtensionPreferredSizeChanged(
+  virtual void OnExtensionSizeChanged(
       ExtensionViewMac* view,
       const gfx::Size& new_size) OVERRIDE {
-    [controller_ onPreferredSizeChanged:
+    [controller_ onSizeChanged:
         NSMakeSize(new_size.width(), new_size.height())];
   }
 
   virtual void OnExtensionViewDidShow(ExtensionViewMac* view) OVERRIDE {
     [controller_ onViewDidShow];
   }
 
  private:
   ExtensionPopupController* controller_; // Weak; owns this.
 };
@@ skipping 215 matching lines @@
   }
 
   // A NSViewFrameDidChangeNotification won't be sent until the extension view
   // content is loaded. The window is hidden on init, so show it the first time
   // the notification is fired (and consequently the view contents have loaded).
   if (![window isVisible]) {
     [self showWindow:self];
   }
 }
 
-- (void)onPreferredSizeChanged:(NSSize)newSize {
+- (void)onSizeChanged:(NSSize)newSize {
   // When we update the size, the window will become visible. Stay hidden until
   // the host is loaded.
-  pendingPreferredSize_ = newSize;
+  pendingSize_ = newSize;
   if (!host_->did_stop_loading())
     return;
 
   // No need to use CA here, our caller calls us repeatedly to animate the
   // resizing.
   NSRect frame = [extensionView_ frame];
   frame.size = newSize;
 
   // |new_size| is in pixels. Convert to view units.
   frame.size = [extensionView_ convertSize:frame.size fromView:nil];
 
-  // On first display of some extensions, this function is called with zero
-  // width after the correct size has been set. Bail if zero is seen, assuming
-  // that an extension's view doesn't want any dimensions to ever be zero.
-  // http://crbug.com/112810 - Verify this assumption and look into WebCore's
-  // |contentsPreferredWidth| to see why this is occurring.
-  if (NSIsEmptyRect(frame))
-    return;
-
   [extensionView_ setFrame:frame];
   [extensionView_ setNeedsDisplay:YES];
 }
 
 - (void)onViewDidShow {
-  [self onPreferredSizeChanged:pendingPreferredSize_];
+  [self onSizeChanged:pendingSize_];
 }
 
 - (void)windowDidResize:(NSNotification*)notification {
   // Let the extension view know, so that it can tell plugins.
   if (host_->view())
     host_->view()->WindowFrameChanged();
 }
 
 - (void)windowDidMove:(NSNotification*)notification {
   // Let the extension view know, so that it can tell plugins.
@@ skipping 12 matching lines @@
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end