[Mac] Base implementation of extension infobars on the mac....

chrome/browser/cocoa/infobar_controller.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/animatable_view.h"
 #include "chrome/browser/cocoa/event_utils.h"
@@ skipping 67 matching lines @@
 
 // Asks the container controller to remove the infobar for this delegate.  This
 // call will trigger a notification that starts the infobar animating closed.
 - (void)removeInfoBar;
 
 // Performs final cleanup after an animation is finished or stopped, including
 // notifying the InfoBarDelegate that the infobar was closed and removing the
 // infobar from its container, if necessary.
 - (void)cleanUpAfterAnimation:(BOOL)finished;
 
-// Removes the ok and cancel buttons, and resizes the textfield to use the
-// space.
-- (void)removeButtons;
-
 // Sets the info bar message to the specified |message|, with a hypertext
 // style link. |link| will be inserted into message at |linkOffset|.
 - (void)setLabelToMessage:(NSString*)message
                  withLink:(NSString*)link
                  atOffset:(NSUInteger)linkOffset;
 @end
 
 @implementation InfoBarController
 
 @synthesize containerController = containerController_;
@@ skipping 105 matching lines @@
   [attributes setObject:font
                  forKey:NSFontAttributeName];
   [attributes setObject:[NSCursor arrowCursor]
                  forKey:NSCursorAttributeName];
   scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:message
                                       attributes:attributes]);
   [[label_.get() textStorage] setAttributedString:attributedString];
 }
 
+- (void)removeButtons {
+  // Extend the label all the way across.
+  NSRect labelFrame = [label_.get() frame];
+  labelFrame.size.width = NSMaxX([cancelButton_ frame]) - NSMinX(labelFrame);
+  [okButton_ removeFromSuperview];
+  [cancelButton_ removeFromSuperview];
+  [label_.get() setFrame:labelFrame];
+}
+
 @end
 
 @implementation InfoBarController (PrivateMethods)
 
 - (void)initializeLabel {
   // Replace the label 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.
   label_.reset([[InfoBarTextView alloc]
       initWithFrame:[labelPlaceholder_ frame]]);
   [label_.get() setAutoresizingMask:[labelPlaceholder_ autoresizingMask]];
   [[labelPlaceholder_ superview]
       replaceSubview:labelPlaceholder_ with:label_.get()];
   labelPlaceholder_ = nil;  // Now released.
   [label_.get() setDelegate:self];
   [label_.get() setEditable:NO];
   [label_.get() setDrawsBackground:NO];
   [label_.get() setHorizontallyResizable:NO];
   [label_.get() setVerticallyResizable:NO];
 }
 
 - (void)removeInfoBar {
   DCHECK(delegate_);
   [containerController_ removeDelegate:delegate_];
 }
 
-- (void)removeButtons {
-  // Extend the label all the way across.
-  // Remove the ok and cancel buttons, since they are not needed.
-  NSRect labelFrame = [label_.get() frame];
-  labelFrame.size.width = NSMaxX([cancelButton_ frame]) - NSMinX(labelFrame);
-  [okButton_ removeFromSuperview];
-  [cancelButton_ removeFromSuperview];
-  [label_.get() setFrame:labelFrame];
-}
-
 - (void)cleanUpAfterAnimation:(BOOL)finished {
   // Don't need to do any cleanup if the bar was animating open.
   if (!infoBarClosing_)
     return;
 
   // Notify the delegate that the infobar was closed.  The delegate may delete
   // itself as a result of InfoBarClosed(), so we null out its pointer.
   if (delegate_) {
     delegate_->InfoBarClosed();
     delegate_ = NULL;
@@ skipping 255 matching lines @@
   LinkInfoBarController* controller =
       [[LinkInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this];
   return new InfoBar(controller);
 }