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

chrome/browser/ui/cocoa/dock_icon.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/dock_icon.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/memory/scoped_nsobject.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 48 matching lines @@
   [appIcon drawInRect:[self bounds]
              fromRect:NSZeroRect
             operation:NSCompositeSourceOver
              fraction:1.0];
 
   if (downloads_ == 0)
     return;
 
   NSRect badgeRect = [self bounds];
   badgeRect.size.height = (int)(kBadgeFraction * badgeRect.size.height);
-  int newWidth = kBadgeFraction * badgeRect.size.width;
-  badgeRect.origin.x = badgeRect.size.width - newWidth;
+  int newWidth = kBadgeFraction * NSWidth(badgeRect);
+  badgeRect.origin.x = NSWidth(badgeRect) - newWidth;
   badgeRect.size.width = newWidth;
 
   CGFloat badgeRadius = NSMidY(badgeRect);
 
   badgeRect.origin.x -= kBadgeIndent;
   badgeRect.origin.y += kBadgeIndent;
 
-  NSPoint badgeCenter = NSMakePoint(NSMidX(badgeRect),
-                                    NSMidY(badgeRect));
+  NSPoint badgeCenter = NSMakePoint(NSMidX(badgeRect), NSMidY(badgeRect));
 
   // Background
   NSColor* backgroundColor = [NSColor colorWithCalibratedRed:0.85
                                                        green:0.85
                                                         blue:0.85
                                                        alpha:1.0];
   NSColor* backgroundHighlight =
       [backgroundColor blendedColorWithFraction:0.85
                                         ofColor:[NSColor whiteColor]];
   scoped_nsobject<NSGradient> backgroundGradient(
@@ skipping 169 matching lines @@
 
 - (void)setProgress:(float)progress {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile];
   DockTileView* dockTileView = (DockTileView*)([dockTile contentView]);
 
   [dockTileView setProgress:progress];
 }
 
 @end