mac: Use NSWidth() and friends in a few more places.

chrome/browser/ui/cocoa/confirm_bubble_cocoa.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/confirm_bubble_cocoa.h"
 
 #import "base/mac/cocoa_protocols.h"
 #include "base/string16.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/confirm_bubble_controller.h"
@@ skipping 155 matching lines @@
 // them into this bubble. This function retrieves text and images from the
 // ConfirmBubbleModel object (via the ConfirmBubbleController object) and
 // layouts them programmatically. This function layouts controls in the botom-up
 // order since NSView uses bottom-up coordinate.
 - (void)performLayout {
   NSRect frameRect = [self frame];
 
   // Add the ok button and the cancel button to the first row if we have either
   // of them.
   CGFloat left = kButtonHEdgeMargin;
-  CGFloat right = frameRect.size.width - kButtonHEdgeMargin;
+  CGFloat right = NSWidth(frameRect) - kButtonHEdgeMargin;
   CGFloat bottom = kButtonVEdgeMargin;
   CGFloat height = 0;
   if ([controller_ hasOkButton]) {
     okButton_.reset([[NSButton alloc]
         initWithFrame:NSMakeRect(0, bottom, 0, 0)]);
     [okButton_.get() setBezelStyle:NSRoundedBezelStyle];
     [okButton_.get() setTitle:[controller_ okButtonText]];
     [okButton_.get() setTarget:self];
     [okButton_.get() setAction:@selector(ok:)];
     [okButton_.get() sizeToFit];
     NSRect okButtonRect = [okButton_.get() frame];
-    right -= okButtonRect.size.width;
+    right -= NSWidth(okButtonRect);
     okButtonRect.origin.x = right;
     [okButton_.get() setFrame:okButtonRect];
     [self addSubview:okButton_.get()];
-    height = std::max(height, okButtonRect.size.height);
+    height = std::max(height, NSHeight(okButtonRect));
   }
   if ([controller_ hasCancelButton]) {
     cancelButton_.reset([[NSButton alloc]
         initWithFrame:NSMakeRect(0, bottom, 0, 0)]);
     [cancelButton_.get() setBezelStyle:NSRoundedBezelStyle];
     [cancelButton_.get() setTitle:[controller_ cancelButtonText]];
     [cancelButton_.get() setTarget:self];
     [cancelButton_.get() setAction:@selector(cancel:)];
     [cancelButton_.get() sizeToFit];
     NSRect cancelButtonRect = [cancelButton_.get() frame];
-    right -= cancelButtonRect.size.width + kButtonHEdgeMargin;
+    right -= NSWidth(cancelButtonRect) + kButtonHEdgeMargin;
     cancelButtonRect.origin.x = right;
     [cancelButton_.get() setFrame:cancelButtonRect];
     [self addSubview:cancelButton_.get()];
-    height = std::max(height, cancelButtonRect.size.height);
+    height = std::max(height, NSHeight(cancelButtonRect));
   }
 
   // Add the message label (and the link label) to the second row.
   left = kButtonHEdgeMargin;
-  right = frameRect.size.width;
+  right = NSWidth(frameRect);
   bottom += height + kRelatedControlVerticalSpacing;
   height = 0;
   messageLabel_.reset([[ConfirmBubbleTextView alloc]
       initWithFrame:NSMakeRect(left, bottom, kMaxMessageWidth, 0)]);
   NSString* messageText = [controller_ messageText];
   NSMutableDictionary* attributes = [NSMutableDictionary dictionary];
   scoped_nsobject<NSMutableAttributedString> attributedMessage(
       [[NSMutableAttributedString alloc] initWithString:messageText
                                              attributes:attributes]);
   NSString* linkText = [controller_ linkText];
   if (linkText) {
     scoped_nsobject<NSAttributedString> whiteSpace(
         [[NSAttributedString alloc] initWithString:@" "]);
     [attributedMessage.get() appendAttributedString:whiteSpace.get()];
     [attributes setObject:[NSString string]
                    forKey:NSLinkAttributeName];
     scoped_nsobject<NSAttributedString> attributedLink(
         [[NSAttributedString alloc] initWithString:linkText
                                         attributes:attributes]);
     [attributedMessage.get() appendAttributedString:attributedLink.get()];
   }
   [[messageLabel_.get() textStorage] setAttributedString:attributedMessage];
   [messageLabel_.get() setHorizontallyResizable:NO];
   [messageLabel_.get() setVerticallyResizable:YES];
   [messageLabel_.get() setEditable:NO];
   [messageLabel_.get() setDrawsBackground:NO];
   [messageLabel_.get() setDelegate:self];
   [messageLabel_.get() sizeToFit];
-  height = [messageLabel_.get() frame].size.height;
+  height = NSHeight([messageLabel_.get() frame]);
   [self addSubview:messageLabel_.get()];
 
   // Add the icon and the title label to the third row.
   left = kButtonHEdgeMargin;
-  right = frameRect.size.width;
+  right = NSWidth(frameRect);
   bottom += height + kLabelToControlVerticalSpacing;
   height = 0;
   NSImage* iconImage = [controller_ icon];
   if (iconImage) {
     icon_.reset([[NSImageView alloc] initWithFrame:NSMakeRect(
         left, bottom, [iconImage size].width, [iconImage size].height)]);
     [icon_.get() setImage:iconImage];
     [self addSubview:icon_.get()];
-    left += [icon_.get() frame].size.width + kRelatedControlHorizontalSpacing;
-    height = std::max(height, [icon_.get() frame].size.height);
+    left += NSWidth([icon_.get() frame]) + kRelatedControlHorizontalSpacing;
+    height = std::max(height, NSHeight([icon_.get() frame]));
   }
   titleLabel_.reset([[NSTextView alloc]
       initWithFrame:NSMakeRect(left, bottom, right - left, 0)]);
   [titleLabel_.get() setString:[controller_ title]];
   [titleLabel_.get() setHorizontallyResizable:NO];
   [titleLabel_.get() setVerticallyResizable:YES];
   [titleLabel_.get() setEditable:NO];
   [titleLabel_.get() setSelectable:NO];
   [titleLabel_.get() setDrawsBackground:NO];
   [titleLabel_.get() sizeToFit];
   [self addSubview:titleLabel_.get()];
-  height = std::max(height, [titleLabel_.get() frame].size.height);
+  height = std::max(height, NSHeight([titleLabel_.get() frame]));
 
   // Adjust the frame rectangle of this bubble so we can show all controls.
   NSRect parentRect = [parent_ frame];
   frameRect.size.height = bottom + height + kButtonVEdgeMargin;
-  frameRect.origin.x = (parentRect.size.width - frameRect.size.width) / 2;
-  frameRect.origin.y = parentRect.size.height - frameRect.size.height;
+  frameRect.origin.x = (NSWidth(parentRect) - NSWidth(frameRect)) / 2;
+  frameRect.origin.y = NSHeight(parentRect) - NSHeight(frameRect);
   [self setFrame:frameRect];
 }
 
 // Closes this bubble and releases all resources. This function just puts the
 // owner ConfirmBubbleController object to the current autorelease pool. (This
 // view will be deleted when the owner object is deleted.)
 - (void)closeBubble {
   [self removeFromSuperview];
   [controller_ autorelease];
   parent_ = nil;
@@ skipping 10 matching lines @@
 
 - (void)clickCancel {
   [self cancel:self];
 }
 
 - (void)clickLink {
   [self textView:messageLabel_.get() clickedOnLink:nil atIndex:0];
 }
 
 @end