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

chrome/browser/ui/cocoa/extensions/shell_window_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.
 
 #include "chrome/browser/ui/cocoa/extensions/shell_window_cocoa.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
@@ skipping 54 matching lines @@
 }
 
 bool ShellWindowCocoa::IsFullscreen() const {
   return false;
 }
 
 gfx::Rect ShellWindowCocoa::GetRestoredBounds() const {
   // Flip coordinates based on the primary screen.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   NSRect frame = [window() frame];
-  gfx::Rect bounds(frame.origin.x, 0, frame.size.width, frame.size.height);
-  bounds.set_y([screen frame].size.height - frame.origin.y - frame.size.height);
+  gfx::Rect bounds(frame.origin.x, 0, NSWidth(frame), NSHeight(frame));
+  bounds.set_y(NSHeight([screen frame]) - NSMaxY(frame));
   return bounds;
 }
 
 gfx::Rect ShellWindowCocoa::GetBounds() const {
   return GetRestoredBounds();
 }
 
 void ShellWindowCocoa::Show() {
   [window_controller_ showWindow:nil];
   [window() makeKeyAndOrderFront:window_controller_];
@@ skipping 41 matching lines @@
   if (bounds.width() < min_size.width)
       checked_bounds.set_width(min_size.width);
   if (bounds.height() < min_size.height)
       checked_bounds.set_height(min_size.height);
 
   NSRect cocoa_bounds = NSMakeRect(checked_bounds.x(), 0,
                                    checked_bounds.width(),
                                    checked_bounds.height());
   // Flip coordinates based on the primary screen.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
-  cocoa_bounds.origin.y =
-      [screen frame].size.height - checked_bounds.height() - checked_bounds.y();
+  cocoa_bounds.origin.y = NSHeight([screen frame]) - checked_bounds.bottom();
 
   [window() setFrame:cocoa_bounds display:YES];
 }
 
 void ShellWindowCocoa::SetDraggableRegion(SkRegion* region) {
   // TODO: implement
 }
 
 void ShellWindowCocoa::FlashFrame(bool flash) {
   if (flash) {
@@ skipping 20 matching lines @@
   return [window_controller_ window];
 }
 
 // static
 ShellWindow* ShellWindow::CreateImpl(Profile* profile,
                                      const extensions::Extension* extension,
                                      const GURL& url,
                                      const ShellWindow::CreateParams params) {
   return new ShellWindowCocoa(profile, extension, url, params);
 }