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

chrome/browser/ui/cocoa/status_bubble_mac.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/status_bubble_mac.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/bubble_view.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.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"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/platform_font.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 
 namespace {
 
 const int kWindowHeight = 18;
@@ skipping 321 matching lines @@
   NSRect base_rect;
   if ([delegate_ respondsToSelector:@selector(statusBubbleBaseFrame)]) {
     base_rect = [delegate_ statusBubbleBaseFrame];
   } else {
     base_rect = [[parent_ contentView] bounds];
     base_rect = [[parent_ contentView] convertRect:base_rect toView:nil];
   }
 
   // To start, assume default positioning in the lower left corner.
   // The window_frame position is in global (screen) coordinates.
-  window_frame.origin = [parent_ convertBaseToScreen:base_rect.origin];
+  window_frame.origin =
+      ui::ConvertPointFromWindowToScreen(parent_, base_rect.origin);
 
   // Get the cursor position relative to the top right corner of the bubble.
   gfx::Point relative_pos(mouse_pos.x() - NSMaxX(window_frame),
                           mouse_pos.y() - NSMaxY(window_frame));
 
   // If the mouse is in a position where we think it would move the
   // status bubble, figure out where and how the bubble should be moved, and
   // what sorts of corners it should have.
   unsigned long corner_flags;
   if (relative_pos.y() < kMousePadding &&
@@ skipping 427 matching lines @@
   Attach();
   UpdateSizeAndPosition();
 }
 
 NSRect StatusBubbleMac::CalculateWindowFrame(bool expanded_width) {
   DCHECK(parent_);
 
   NSRect screenRect;
   if ([delegate_ respondsToSelector:@selector(statusBubbleBaseFrame)]) {
     screenRect = [delegate_ statusBubbleBaseFrame];
-    screenRect.origin = [parent_ convertBaseToScreen:screenRect.origin];
+    screenRect = [parent_ convertRectToScreen:screenRect];
   } else {
     screenRect = [parent_ frame];
   }
 
   NSSize size = NSMakeSize(0, kWindowHeight);
   size = [[parent_ contentView] convertSize:size toView:nil];
 
   if (expanded_width) {
     size.width = screenRect.size.width;
   } else {
@@ skipping 24 matching lines @@
     }
 
     // Round the top corners when the bubble is below the parent window.
     if (NSMinY(window_frame) < NSMinY(parent_frame)) {
       corner_flags |= kRoundedTopLeftCorner | kRoundedTopRightCorner;
     }
   }
 
   return corner_flags;
 }