Fix ScreenCapturerMac handling of secondary configurations.

media/video/capture/screen/mac/desktop_configuration.h

 // Copyright (c) 2013 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.
 
 #ifndef MEDIA_VIDEO_CAPTURE_SCREEN_MAC_DESKTOP_CONFIGURATION_H_
 #define MEDIA_VIDEO_CAPTURE_SCREEN_MAC_DESKTOP_CONFIGURATION_H_
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <Carbon/Carbon.h>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "media/base/media_export.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 namespace media {
 
 // Describes the configuration of a specific display.
 struct MEDIA_EXPORT MacDisplayConfiguration {
   MacDisplayConfiguration();
 
-  // Returns the current configuration of the specified display.
-  MEDIA_EXPORT static MacDisplayConfiguration ForDisplay(
-      CGDirectDisplayID display_id);
-
   // Cocoa identifier for this display.
   CGDirectDisplayID id;
 
   // Bounds of this display in Density-Independent Pixels (DIPs).
   SkIRect bounds;
 
   // Bounds of this display in physical pixels.
   SkIRect pixel_bounds;
 
   // Scale factor from DIPs to physical pixels.
   float dip_to_pixel_scale;
 };
 
 typedef std::vector<MacDisplayConfiguration> MacDisplayConfigurations;
 
 // Describes the configuration of the whole desktop.
 struct MEDIA_EXPORT MacDesktopConfiguration {
+  // Used to request bottom-up or top-down coordinates.
+  enum Origin { BottomLeftOrigin, TopLeftOrigin };
+
   MacDesktopConfiguration();
   ~MacDesktopConfiguration();
 
-  // Returns the current configuration of the desktop.
-  MEDIA_EXPORT static MacDesktopConfiguration GetCurrent();
+  // Returns the desktop & display configurations in Cocoa-style "bottom-up"
+  // (the origin is the bottom-left of the primary monitor, and coordinates
+  // increase as you move up the screen) or Carbon-style "top-down" coordinates.
+  MEDIA_EXPORT static MacDesktopConfiguration GetCurrent(Origin origin);
 
   // Bounds of the desktop in Density-Independent Pixels (DIPs).
   SkIRect bounds;
 
   // Bounds of the desktop in physical pixels.
   SkIRect pixel_bounds;
 
   // Scale factor from DIPs to physical pixels.
   float dip_to_pixel_scale;
 
   // Configurations of the displays making up the desktop area.
   MacDisplayConfigurations displays;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_SCREEN_MAC_DESKTOP_CONFIGURATION_H_