OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ | 5 #ifndef UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ |
6 #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ | 6 #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 class DISPLAY_EXPORT DisplaySnapshotX11 : public DisplaySnapshot { | 21 class DISPLAY_EXPORT DisplaySnapshotX11 : public DisplaySnapshot { |
22 public: | 22 public: |
23 DisplaySnapshotX11(int64_t display_id, | 23 DisplaySnapshotX11(int64_t display_id, |
24 const gfx::Point& origin, | 24 const gfx::Point& origin, |
25 const gfx::Size& physical_size, | 25 const gfx::Size& physical_size, |
26 DisplayConnectionType type, | 26 DisplayConnectionType type, |
27 bool is_aspect_preserving_scaling, | 27 bool is_aspect_preserving_scaling, |
28 bool has_overscan, | 28 bool has_overscan, |
29 std::string display_name, | 29 std::string display_name, |
30 const std::vector<const DisplayMode*>& modes, | 30 const std::vector<const DisplayMode*>& modes, |
| 31 const std::vector<uint8_t>& edid, |
31 const DisplayMode* current_mode, | 32 const DisplayMode* current_mode, |
32 const DisplayMode* native_mode, | 33 const DisplayMode* native_mode, |
33 RROutput output, | 34 RROutput output, |
34 RRCrtc crtc, | 35 RRCrtc crtc, |
35 int index); | 36 int index); |
36 ~DisplaySnapshotX11() override; | 37 ~DisplaySnapshotX11() override; |
37 | 38 |
38 RROutput output() const { return output_; } | 39 RROutput output() const { return output_; } |
39 RRCrtc crtc() const { return crtc_; } | 40 RRCrtc crtc() const { return crtc_; } |
40 int index() const { return index_; } | 41 int index() const { return index_; } |
(...skipping 11 matching lines...) Expand all Loading... |
52 // This output's index in the array returned by XRandR. Stable even as | 53 // This output's index in the array returned by XRandR. Stable even as |
53 // outputs are connected or disconnected. | 54 // outputs are connected or disconnected. |
54 int index_; | 55 int index_; |
55 | 56 |
56 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11); | 57 DISALLOW_COPY_AND_ASSIGN(DisplaySnapshotX11); |
57 }; | 58 }; |
58 | 59 |
59 } // namespace ui | 60 } // namespace ui |
60 | 61 |
61 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ | 62 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_SNAPSHOT_X11_H_ |
OLD | NEW |