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

chrome/browser/ui/cocoa/panels/panel_titlebar_view_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/panels/panel_titlebar_view_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #import "chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.h"
 #import "chrome/browser/ui/panels/panel_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/hover_image_button.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 // 'Glint' is a glowing light animation on the titlebar to attract user's
 // attention. Numbers are arbitrary, based on several tries.
 const double kGlintAnimationDuration = 1.5;
@@ skipping 384 matching lines @@
 - (void)mouseDragged:(NSEvent*)event {
   [dragController_ mouseDragged:event];
 }
 
 // MouseDragControllerClient implementaiton
 
 - (void)prepareForDrag {
 }
 
 - (void)dragStarted:(NSPoint)initialMouseLocation {
-  NSPoint initialMouseLocationScreen =
-      [[self window] convertBaseToScreen:initialMouseLocation];
+  NSPoint initialMouseLocationScreen = ui::ConvertPointFromWindowToScreen(
+      [self window], initialMouseLocation);
   [controller_ startDrag:initialMouseLocationScreen];
 }
 
 - (void)dragEnded:(BOOL)cancelled {
   [controller_ endDrag:cancelled];
 }
 
 - (void)dragProgress:(NSPoint)mouseLocation {
-  NSPoint mouseLocationScreen =
-      [[self window] convertBaseToScreen:mouseLocation];
+  NSPoint mouseLocationScreen = ui::ConvertPointFromWindowToScreen(
+      [self window], mouseLocation);
   [controller_ drag:mouseLocationScreen];
 }
 
 - (void)cleanupAfterDrag {
 }
 
 // End of MouseDragControllerClient implementaiton
 
 - (void)drawAttention {
   if (isDrawingAttention_)
@@ skipping 80 matching lines @@
 - (void)simulateCloseButtonClick {
   [[customCloseButton_ cell] performClick:customCloseButton_];
 }
 
 - (void)pressLeftMouseButtonTitlebar:(NSPoint)mouseLocation
                            modifiers:(int)modifierFlags {
   // Override the drag controller. It's ok to create a new one for each drag.
   dragController_.reset([[TestDragController alloc] initWithClient:self]);
   // Convert from Cocoa's screen coordinates to base coordinates since the mouse
   // event takes base (NSWindow) coordinates.
-  NSPoint mouseLocationWindow =
-      [[self window] convertScreenToBase:mouseLocation];
+  NSPoint mouseLocationWindow = ui::ConvertPointFromScreenToWindow(
+      [self window], mouseLocation);
   NSEvent* event = MakeMouseEvent(NSLeftMouseDown, mouseLocationWindow,
       modifierFlags, 0);
   [self mouseDown:event];
 }
 
 - (void)releaseLeftMouseButtonTitlebar:(int)modifierFlags {
   NSEvent* event = MakeMouseEvent(NSLeftMouseUp, NSZeroPoint, modifierFlags, 1);
   [self mouseUp:event];
 }
 
 - (void)dragTitlebar:(NSPoint)mouseLocation {
   // Convert from Cocoa's screen coordinates to base coordinates since the mouse
   // event takes base (NSWindow) coordinates.
-  NSPoint mouseLocationWindow =
-      [[self window] convertScreenToBase:mouseLocation];
+  NSPoint mouseLocationWindow = ui::ConvertPointFromScreenToWindow(
+      [self window], mouseLocation);
   NSEvent* event =
       MakeMouseEvent(NSLeftMouseDragged, mouseLocationWindow, 0, 0);
   [self mouseDragged:event];
 }
 
 - (void)cancelDragTitlebar {
   [self dragEnded:YES];
 }
 
 - (void)finishDragTitlebar {
   [self dragEnded:NO];
 }
 
 - (NSButton*)closeButton {
   return closeButton_;
 }
 
 - (NSButton*)minimizeButton {
   return minimizeButton_;
 }
 
 - (NSButton*)restoreButton {
   return restoreButton_;
 }
 
 @end