Mac InfoBar: Use cross platform infobar classes

chrome/browser/ui/cocoa/infobars/extension_infobar_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/infobars/extension_infobar_controller.h"
 
 #include <cmath>
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
-#include "chrome/browser/ui/cocoa/infobars/infobar.h"
+#include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "extensions/common/extension_resource.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 107 matching lines @@
   ExtensionInfoBarDelegate* delegate_;
 
   base::WeakPtrFactory<InfobarBridge> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InfobarBridge);
 };
 
 
 @implementation ExtensionInfoBarController
 
-- (id)initWithDelegate:(InfoBarDelegate*)delegate
-                 owner:(InfoBarService*)owner
-                window:(NSWindow*)window {
-  if ((self = [super initWithDelegate:delegate owner:owner])) {
+- (id)initWithInfoBar:(InfoBarCocoa*)infobar
+               window:(NSWindow*)window {
+  if ((self = [super initWithInfoBar:infobar])) {
     window_ = window;
     dropdownButton_.reset([[MenuButton alloc] init]);
     [dropdownButton_ setOpenMenuOnClick:YES];
 
     extensions::ExtensionHost* extensionHost =
-        delegate_->AsExtensionInfoBarDelegate()->extension_host();
-    Browser* browser =
-        chrome::FindBrowserWithWebContents(owner->web_contents());
+        [self delegate]->AsExtensionInfoBarDelegate()->extension_host();
+    Browser* browser = chrome::FindBrowserWithWebContents(
+        [self infobar]->OwnerCocoa()->web_contents());
     contextMenu_.reset([[ExtensionActionContextMenu alloc]
         initWithExtension:extensionHost->extension()
                   browser:browser
           extensionAction:NULL]);
     // See menu_button.h for documentation on why this is needed.
     NSMenuItem* dummyItem =
         [[[NSMenuItem alloc] initWithTitle:@""
                                     action:nil
                              keyEquivalent:@""] autorelease];
     [contextMenu_ insertItem:dummyItem atIndex:0];
     [dropdownButton_ setAttachedMenu:contextMenu_.get()];
 
     bridge_.reset(new InfobarBridge(self));
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)addAdditionalControls {
   [self removeButtons];
 
-  extensionView_ = delegate_->AsExtensionInfoBarDelegate()->extension_host()->
-      view()->native_view();
+  extensionView_ = [self delegate]->AsExtensionInfoBarDelegate()
+      ->extension_host()->view()->native_view();
 
   // Add the extension's RenderWidgetHostView to the view hierarchy of the
   // InfoBar and make sure to place it below the Close button.
   [infoBarView_ addSubview:extensionView_
                 positioned:NSWindowBelow
                 relativeTo:(NSView*)closeButton_];
 
   // Add the context menu button to the hierarchy.
   [dropdownButton_ setShowsBorderOnlyWhileMouseInside:YES];
   CGFloat buttonY =
@@ skipping 10 matching lines @@
   NSRect extensionFrame = [extensionView_ frame];
   extensionFrame.origin.y = kBottomBorderHeightPx;
 
   [extensionView_ setFrame:extensionFrame];
   // The extension's native view will only have a height that is non-zero if it
   // already has been loaded and rendered, which is the case when you switch
   // back to a tab with an extension infobar within it. The reason this is
   // needed is because the extension view's frame will not have changed in the
   // above case, so the NSViewFrameDidChangeNotification registered below will
   // never fire.
-  if (NSHeight(extensionFrame) > 0.0) {
-    NSSize infoBarSize = [[self view] frame].size;
-    infoBarSize.height = [self clampedExtensionViewHeight] +
-        kBottomBorderHeightPx;
-    [[self view] setFrameSize:infoBarSize];
-    [infoBarView_ setFrameSize:infoBarSize];
-  }
+  if (NSHeight(extensionFrame) > 0.0)
+    [self infobar]->SetBarTargetHeight([self clampedExtensionViewHeight]);
 
   [self adjustExtensionViewSize];
 
   // These two notification handlers are here to ensure the width of the
   // native extension view is the same as the browser window's width and that
   // the parent infobar view matches the height of the extension's native view.
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(extensionViewFrameChanged)
              name:NSViewFrameDidChangeNotification
            object:extensionView_];
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(adjustExtensionViewSize)
              name:NSWindowDidResizeNotification
            object:window_];
 }
 
 - (void)infobarWillClose {
   [self disablePopUpMenu:contextMenu_.get()];
   [super infobarWillClose];
 }
 
 - (void)extensionViewFrameChanged {
   [self adjustExtensionViewSize];
-
-  AnimatableView* view = [self animatableView];
-  NSRect infoBarFrame = [view frame];
-  CGFloat newHeight = [self clampedExtensionViewHeight] + kBottomBorderHeightPx;
-  [infoBarView_ setPostsFrameChangedNotifications:NO];
-  infoBarFrame.size.height = newHeight;
-  [infoBarView_ setFrame:infoBarFrame];
-  [infoBarView_ setPostsFrameChangedNotifications:YES];
-  [view animateToNewHeight:newHeight duration:kAnimationDuration];
+  [self infobar]->SetBarTargetHeight([self clampedExtensionViewHeight]);
 }
 
 - (CGFloat)clampedExtensionViewHeight {
-  CGFloat height = delegate_->AsExtensionInfoBarDelegate()->height();
+  CGFloat height = [self delegate]->AsExtensionInfoBarDelegate()->height();
   return std::max(kToolbarMinHeightPx, std::min(height, kToolbarMaxHeightPx));
 }
 
 - (void)adjustExtensionViewSize {
   [extensionView_ setPostsFrameChangedNotifications:NO];
   NSSize extensionViewSize = [extensionView_ frame].size;
   extensionViewSize.width = NSWidth([window_ frame]);
   extensionViewSize.height = [self clampedExtensionViewHeight];
   [extensionView_ setFrameSize:extensionViewSize];
   [extensionView_ setPostsFrameChangedNotifications:YES];
 }
 
 - (void)setButtonImage:(NSImage*)image {
   [dropdownButton_ setImage:image];
 }
 
 @end
 
 InfoBar* ExtensionInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(owner, this));
   NSWindow* window =
       [(NSView*)owner->web_contents()->GetView()->GetContentNativeView()
           window];
-  ExtensionInfoBarController* controller =
-      [[ExtensionInfoBarController alloc] initWithDelegate:this
-                                                     owner:owner
-                                                    window:window];
-  return new InfoBar(controller, this);
+  base::scoped_nsobject<ExtensionInfoBarController> controller(
+      [[ExtensionInfoBarController alloc] initWithInfoBar:infobar.get()
+                                                   window:window]);
+  infobar->set_controller(controller);
+  return infobar.release();
 }