Reland of move all reference to carbon api

webrtc/modules/desktop_capture/mac/desktop_configuration.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_
 
 #include <ApplicationServices/ApplicationServices.h>
-#include <Carbon/Carbon.h>
 #include <vector>
 
 #include "webrtc/typedefs.h"
 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace webrtc {
 
 // Describes the configuration of a specific display.
 struct MacDisplayConfiguration {
   MacDisplayConfiguration();
@@ skipping 16 matching lines @@
 // Describes the configuration of the whole desktop.
 struct MacDesktopConfiguration {
   // Used to request bottom-up or top-down coordinates.
   enum Origin { BottomLeftOrigin, TopLeftOrigin };
 
   MacDesktopConfiguration();
   ~MacDesktopConfiguration();
 
   // 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.
+  // increase as you move up the screen).
   static MacDesktopConfiguration GetCurrent(Origin origin);
 
   // Returns true if the given desktop configuration equals this one.
   bool Equals(const MacDesktopConfiguration& other);
 
   // Returns the pointer to the display configuration with the specified id.
   const MacDisplayConfiguration* FindDisplayConfigurationById(
       CGDirectDisplayID id);
 
   // Bounds of the desktop excluding monitors with DPI settings different from
   // the main monitor. In Density-Independent Pixels (DIPs).
   DesktopRect bounds;
 
   // Same as bounds, but expressed in physical pixels.
   DesktopRect 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 webrtc
 
 #endif  // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_