Fix Mac window frame coordinate conversion on multiple monitor setups

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2010 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 <QuartzCore/CAOpenGLLayer.h>
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #import "base/chrome_application_mac.h"
 #include "base/histogram.h"
@@ skipping 576 matching lines @@
 }
 
 void RenderWidgetHostViewMac::ShutdownHost() {
   shutdown_factory_.RevokeAll();
   render_widget_host_->Shutdown();
   // Do not touch any members at this point, |this| has been deleted.
 }
 
 namespace {
 
-// Adjusts an NSRect in screen coordinates to have an origin in the upper left,
-// and stuffs it into a gfx::Rect. This is likely incorrect for a multiple-
-// monitor setup.
-gfx::Rect NSRectToRect(const NSRect rect, NSScreen* screen) {
+// Adjusts an NSRect in Cocoa screen coordinates to have an origin in the upper
+// left of the primary screen (Carbon coordinates), and stuffs it into a
+// gfx::Rect.
+gfx::Rect NSRectToRect(const NSRect rect) {
   gfx::Rect new_rect(NSRectToCGRect(rect));
-  new_rect.set_y([screen frame].size.height - new_rect.y() - new_rect.height());
+  if ([[NSScreen screens] count] > 0) {
+    new_rect.set_y([[[NSScreen screens] objectAtIndex:0] frame].size.height -
+                   new_rect.y() - new_rect.height());
+  }
   return new_rect;
 }
 
 }  // namespace
 
 gfx::Rect RenderWidgetHostViewMac::GetWindowRect() {
   // TODO(shess): In case of !window, the view has been removed from
   // the view hierarchy because the tab isn't main.  Could retrieve
   // the information from the main tab for our window.
   NSWindow* enclosing_window = [cocoa_view_ window];
   if (!cocoa_view_ || !enclosing_window) {
     return gfx::Rect();
   }
 
   // During dragging of a torn-off tab, [cocoa_view_ window] is a floating panel
   // attached to the actual browser window that the tab is visually part of; we
   // want the bounds of the browser window rather than the panel.
   if ([enclosing_window parentWindow])
     enclosing_window = [enclosing_window parentWindow];
 
   NSRect bounds = [cocoa_view_ bounds];
   bounds = [cocoa_view_ convertRect:bounds toView:nil];
   bounds.origin = [enclosing_window convertBaseToScreen:bounds.origin];
-  return NSRectToRect(bounds, [[cocoa_view_ window] screen]);
+  return NSRectToRect(bounds);
 }
 
 gfx::Rect RenderWidgetHostViewMac::GetRootWindowRect() {
   // TODO(shess): In case of !window, the view has been removed from
   // the view hierarchy because the tab isn't main.  Could retrieve
   // the information from the main tab for our window.
   NSWindow* enclosing_window = [cocoa_view_ window];
   if (!enclosing_window) {
     return gfx::Rect();
   }
 
   // During dragging of a torn-off tab, [cocoa_view_ window] is a floating panel
   // attached to the actual browser window that the tab is visually part of; we
   // want the bounds of the browser window rather than the panel.
   if ([enclosing_window parentWindow])
     enclosing_window = [enclosing_window parentWindow];
 
   NSRect bounds = [enclosing_window frame];
-  return NSRectToRect(bounds, [enclosing_window screen]);
+  return NSRectToRect(bounds);
 }
 
 void RenderWidgetHostViewMac::SetActive(bool active) {
   if (render_widget_host_)
     render_widget_host_->SetActive(active);
 }
 
 void RenderWidgetHostViewMac::SetWindowVisibility(bool visible) {
   if (render_widget_host_) {
     render_widget_host_->Send(new ViewMsg_SetWindowVisibility(
@@ skipping 1003 matching lines @@
 }
 
 - (void)pasteAsPlainText:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
       ForwardEditCommand("PasteAndMatchStyle", "");
   }
 }
 
 @end