Fixes GetContainerBounds in tab_contents_view_mac.mm

chrome/browser/tab_contents/tab_contents_view_mac.mm

 // Copyright (c) 2011 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 <Carbon/Carbon.h>
 
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 131 matching lines @@
   if (!rwhv)
     return NULL;
   return rwhv->GetNativeView();
 }
 
 gfx::NativeWindow TabContentsViewMac::GetTopLevelNativeWindow() const {
   return [cocoa_view_.get() window];
 }
 
 void TabContentsViewMac::GetContainerBounds(gfx::Rect* out) const {
-  *out = [cocoa_view_.get() flipNSRectToRect:[cocoa_view_.get() bounds]];
+  // Convert bounds to window coordinate space.
+  NSRect bounds =
+      [cocoa_view_.get() convertRect:[cocoa_view_.get() bounds] toView:nil];
+
+  // Convert bounds to screen coordinate space.
+  NSWindow* window = [cocoa_view_.get() window];
+  NSPoint origin = [window convertBaseToScreen:bounds.origin];
+  bounds = NSMakeRect(origin.x, origin.y, bounds.size.width,
+      bounds.size.height);

[Avi (use Gerrit), 2011/11/14 21:27:14]

alternatively:

bounds.origin = [window convertBaseToScreen:bounds.origin]

instead of those two lines :)

+
+  // Flip y to account for screen flip.
+  NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
+  bounds.origin.y = [screen frame].size.height - bounds.origin.y
+      - bounds.size.height;
+  *out = gfx::Rect(NSRectToCGRect(bounds));
 }
 
 void TabContentsViewMac::StartDragging(
     const WebDropData& drop_data,
     WebDragOperationsMask allowed_operations,
     const SkBitmap& image,
     const gfx::Point& image_offset) {
   // By allowing nested tasks, the code below also allows Close(),
   // which would deallocate |this|.  The same problem can occur while
   // processing -sendEvent:, so Close() is deferred in that case.
@@ skipping 434 matching lines @@
       [[[notification userInfo] objectForKey:kSelectionDirection]
         unsignedIntegerValue];
   if (direction == NSDirectSelection)
     return;
 
   [self tabContents]->
       FocusThroughTabTraversal(direction == NSSelectingPrevious);
 }
 
 @end