Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Side by Side Diff: webrtc/modules/desktop_capture/mac/desktop_configuration.h

Issue 2299633002: Remove all reference to carbon api (Closed)
Patch Set: Fix chromium build errors Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/media/media.gyp ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_
13 13
14 #include <ApplicationServices/ApplicationServices.h> 14 #include <ApplicationServices/ApplicationServices.h>
15 #include <Carbon/Carbon.h>
16 #include <vector> 15 #include <vector>
17 16
18 #include "webrtc/typedefs.h" 17 #include "webrtc/typedefs.h"
19 #include "webrtc/modules/desktop_capture/desktop_geometry.h" 18 #include "webrtc/modules/desktop_capture/desktop_geometry.h"
20 19
21 namespace webrtc { 20 namespace webrtc {
22 21
23 // Describes the configuration of a specific display. 22 // Describes the configuration of a specific display.
24 struct MacDisplayConfiguration { 23 struct MacDisplayConfiguration {
25 MacDisplayConfiguration(); 24 MacDisplayConfiguration();
(...skipping 16 matching lines...) Expand all
42 // Describes the configuration of the whole desktop. 41 // Describes the configuration of the whole desktop.
43 struct MacDesktopConfiguration { 42 struct MacDesktopConfiguration {
44 // Used to request bottom-up or top-down coordinates. 43 // Used to request bottom-up or top-down coordinates.
45 enum Origin { BottomLeftOrigin, TopLeftOrigin }; 44 enum Origin { BottomLeftOrigin, TopLeftOrigin };
46 45
47 MacDesktopConfiguration(); 46 MacDesktopConfiguration();
48 ~MacDesktopConfiguration(); 47 ~MacDesktopConfiguration();
49 48
50 // Returns the desktop & display configurations in Cocoa-style "bottom-up" 49 // Returns the desktop & display configurations in Cocoa-style "bottom-up"
51 // (the origin is the bottom-left of the primary monitor, and coordinates 50 // (the origin is the bottom-left of the primary monitor, and coordinates
52 // increase as you move up the screen) or Carbon-style "top-down" coordinates. 51 // increase as you move up the screen).
53 static MacDesktopConfiguration GetCurrent(Origin origin); 52 static MacDesktopConfiguration GetCurrent(Origin origin);
54 53
55 // Returns true if the given desktop configuration equals this one. 54 // Returns true if the given desktop configuration equals this one.
56 bool Equals(const MacDesktopConfiguration& other); 55 bool Equals(const MacDesktopConfiguration& other);
57 56
58 // Returns the pointer to the display configuration with the specified id. 57 // Returns the pointer to the display configuration with the specified id.
59 const MacDisplayConfiguration* FindDisplayConfigurationById( 58 const MacDisplayConfiguration* FindDisplayConfigurationById(
60 CGDirectDisplayID id); 59 CGDirectDisplayID id);
61 60
62 // Bounds of the desktop excluding monitors with DPI settings different from 61 // Bounds of the desktop excluding monitors with DPI settings different from
63 // the main monitor. In Density-Independent Pixels (DIPs). 62 // the main monitor. In Density-Independent Pixels (DIPs).
64 DesktopRect bounds; 63 DesktopRect bounds;
65 64
66 // Same as bounds, but expressed in physical pixels. 65 // Same as bounds, but expressed in physical pixels.
67 DesktopRect pixel_bounds; 66 DesktopRect pixel_bounds;
68 67
69 // Scale factor from DIPs to physical pixels. 68 // Scale factor from DIPs to physical pixels.
70 float dip_to_pixel_scale; 69 float dip_to_pixel_scale;
71 70
72 // Configurations of the displays making up the desktop area. 71 // Configurations of the displays making up the desktop area.
73 MacDisplayConfigurations displays; 72 MacDisplayConfigurations displays;
74 }; 73 };
75 74
76 } // namespace webrtc 75 } // namespace webrtc
77 76
78 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ 77 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_
OLDNEW
« no previous file with comments | « webrtc/media/media.gyp ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698