GetDisplayForScreen cleanup

ui/gfx/screen_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 "ui/gfx/screen.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
@@ skipping 24 matching lines @@
     int area = intersection.width() * intersection.height();
     if (area > max_area) {
       max_area = area;
       max_screen = screen;
     }
   }
 
   return max_screen;
 }
 
-gfx::Display GetDisplayForScreen(NSScreen* screen, bool is_primary) {
+gfx::Display GetDisplayForScreen(NSScreen* screen) {
   NSRect frame = [screen frame];
   // TODO(oshima): Implement ID and Observer.
   gfx::Display display(0, gfx::Rect(NSRectToCGRect(frame)));
 
   NSRect visible_frame = [screen visibleFrame];
+  NSScreen* primary = [[NSScreen screens] objectAtIndex:0];
 
   // Convert work area's coordinate systems.
-  if (is_primary) {
+  if (screen == primary) {

[Nico, 2013/10/30 17:06:19]

this should probably be [screen isEqual:primary] (add some local debug logging
to make sure this doesn't change behavior in practice if you change this)

     gfx::Rect work_area = gfx::Rect(NSRectToCGRect(visible_frame));
     work_area.set_y(frame.size.height - visible_frame.origin.y -
                     visible_frame.size.height);
     display.set_work_area(work_area);
   } else {
     display.set_bounds(ConvertCoordinateSystem(frame));
     display.set_work_area(ConvertCoordinateSystem(visible_frame));
   }
   CGFloat scale;
   if ([screen respondsToSelector:@selector(backingScaleFactor)])
@@ skipping 71 matching lines @@
   }
 
   virtual gfx::Display GetDisplayNearestWindow(
       gfx::NativeView view) const OVERRIDE {
     NSWindow* window = [view window];
     if (!window)
       return GetPrimaryDisplay();
     NSScreen* match_screen = [window screen];
     if (!match_screen)
       return GetPrimaryDisplay();
-    return GetDisplayForScreen(match_screen, false /* may not be primary */);
+    return GetDisplayForScreen(match_screen);
   }
 
   virtual gfx::Display GetDisplayNearestPoint(
       const gfx::Point& point) const OVERRIDE {
     NSPoint ns_point = NSPointFromCGPoint(point.ToCGPoint());
 
     NSArray* screens = [NSScreen screens];
     NSScreen* primary = [screens objectAtIndex:0];
     ns_point.y = NSMaxY([primary frame]) - ns_point.y;
     for (NSScreen* screen in screens) {
       if (NSMouseInRect(ns_point, [screen frame], NO))
-        return GetDisplayForScreen(screen, screen == primary);
+        return GetDisplayForScreen(screen);
     }
     return GetPrimaryDisplay();
   }
 
   // Returns the display that most closely intersects the provided bounds.
   virtual gfx::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const OVERRIDE {
     NSScreen* match_screen = GetMatchingScreen(match_rect);
-    return GetDisplayForScreen(match_screen, false /* may not be primary */);
+    return GetDisplayForScreen(match_screen);
   }
 
   // Returns the primary display.
   virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
     // Primary display is defined as the display with the menubar,
     // which is always at index 0.
     NSScreen* primary = [[NSScreen screens] objectAtIndex:0];
-    gfx::Display display = GetDisplayForScreen(primary, true /* primary */);
+    gfx::Display display = GetDisplayForScreen(primary);
     return display;
   }
 
   virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {
     // TODO(oshima): crbug.com/122863.
   }
 
   virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {
     // TODO(oshima): crbug.com/122863.
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenMac);
 };
 
 }  // namespace
 
 namespace gfx {
 
 Screen* CreateNativeScreen() {
   return new ScreenMac;
 }
 
 }