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

chrome/browser/ui/cocoa/image_button_cell.mm

 // Copyright (c) 2011 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/image_button_cell.h"
 
 #include "base/logging.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
@@ skipping 50 matching lines @@
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   BOOL windowHasFocus = [[controlView window] isMainWindow] ||
                         [[controlView window] isKeyWindow];
   CGFloat alpha = windowHasFocus ? 1.0 : kImageNoFocusAlpha;
 
   NSImage* image = [self imageForID:imageID_[[self currentButtonState]]
                         controlView:controlView];
   NSRect imageRect;
   imageRect.size = [image size];
   imageRect.origin.x = cellFrame.origin.x +
-    roundf((cellFrame.size.width - imageRect.size.width) / 2.0);
+    roundf((NSWidth(cellFrame) - NSWidth(imageRect)) / 2.0);
   imageRect.origin.y = cellFrame.origin.y +
-    roundf((cellFrame.size.height - imageRect.size.height) / 2.0);
+    roundf((NSHeight(cellFrame) - NSHeight(imageRect)) / 2.0);
 
   [image drawInRect:imageRect
            fromRect:NSZeroRect
           operation:NSCompositeSourceOver
            fraction:alpha
        neverFlipped:YES];
 
   if (overlayImageID_) {
     NSImage* overlayImage = [self imageForID:overlayImageID_
                                  controlView:controlView];
     NSRect overlayRect;
     overlayRect.size = [overlayImage size];
-    overlayRect.origin.x = NSMaxX(imageRect) - overlayRect.size.width +
+    overlayRect.origin.x = NSMaxX(imageRect) - NSWidth(overlayRect) +
                            kOverlayOffsetX;
     overlayRect.origin.y = NSMinY(imageRect) + kOverlayOffsetY;
 
     [overlayImage drawInRect:overlayRect
                     fromRect:NSZeroRect
                    operation:NSCompositeSourceOver
                     fraction:1.0
                 neverFlipped:YES];
   }
 }
@@ skipping 62 matching lines @@
 
 - (void)mouseEntered:(NSEvent*)theEvent {
   [self setIsMouseInside:YES];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [self setIsMouseInside:NO];
 }
 
 @end