Prepare chrome/ for compilation with OS X 10.7 deployment target.

chrome/browser/ui/cocoa/bookmarks/bookmark_button.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/bookmarks/bookmark_button.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/user_metrics.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 
 // The opacity of the bookmark button drag image.
 static const CGFloat kDragImageOpacity = 0.7;
 
 namespace {
@@ skipping 74 matching lines @@
     if ([self isFlipped]) {
       point.y += [self bounds].size.height - dragMouseOffset_.y;
     } else {
       point.y += dragMouseOffset_.y;
     }
   } else {
     // Use the middle of this button as the location.
     NSRect bounds = [self bounds];
     point = NSMakePoint(NSMidX(bounds), NSMidY(bounds));
     point = [self convertPoint:point toView:nil];
-    point = [[self window] convertBaseToScreen:point];
+    point = ui::ConvertPointFromWindowToScreen([self window], point);
   }
 
   return point;
 }
 
 
 - (void)updateTrackingAreas {
   [self installCustomTrackingArea];
   [super updateTrackingAreas];
 }
@@ skipping 344 matching lines @@
   [[cell clipPathForFrame:bounds inView:self] setClip];
   [cell drawWithFrame:bounds inView:self];
 
   CGContextEndTransparencyLayer(cgContext);
   [image unlockFocus];
 
   return image.autorelease();
 }
 
 @end  // @implementation BookmarkButton(Private)