| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_MANAGER_DISPLAY_LAYOUT_H_ | 5 #ifndef UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_ |
| 6 #define UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_ | 6 #define UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/strings/string_piece.h" | 15 #include "base/strings/string_piece.h" |
| 16 #include "ui/display/display_export.h" | 16 #include "ui/display/display_export.h" |
| 17 | 17 |
| 18 namespace base { | 18 namespace base { |
| 19 class Value; | 19 class Value; |
| 20 template <typename T> class JSONValueConverter; | 20 template <typename T> class JSONValueConverter; |
| 21 } | 21 } |
| 22 | 22 |
| 23 namespace gfx { | 23 namespace display { |
| 24 class Display; | 24 class Display; |
| 25 } | |
| 26 | |
| 27 namespace display { | |
| 28 using Display = gfx::Display; | |
| 29 | 25 |
| 30 // An identifier used to manage display layout in DisplayManager / | 26 // An identifier used to manage display layout in DisplayManager / |
| 31 // DisplayLayoutStore. | 27 // DisplayLayoutStore. |
| 32 using DisplayIdList = std::vector<int64_t>; | 28 using DisplayIdList = std::vector<int64_t>; |
| 33 | 29 |
| 34 using DisplayList = std::vector<display::Display>; | 30 using DisplayList = std::vector<display::Display>; |
| 35 | 31 |
| 36 // DisplayPlacement specifies where the display (D) is placed relative | 32 // DisplayPlacement specifies where the display (D) is placed relative |
| 37 // to parent (P) display. In the following example, the display (D) | 33 // to parent (P) display. In the following example, the display (D) |
| 38 // given by |display_id| is placed at the left side of the parent | 34 // given by |display_id| is placed at the left side of the parent |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 static bool ApplyDisplayPlacement(const DisplayPlacement& placement, | 116 static bool ApplyDisplayPlacement(const DisplayPlacement& placement, |
| 121 DisplayList* display_list, | 117 DisplayList* display_list, |
| 122 int minimum_offset_overlap); | 118 int minimum_offset_overlap); |
| 123 | 119 |
| 124 DISALLOW_COPY_AND_ASSIGN(DisplayLayout); | 120 DISALLOW_COPY_AND_ASSIGN(DisplayLayout); |
| 125 }; | 121 }; |
| 126 | 122 |
| 127 } // namespace display | 123 } // namespace display |
| 128 | 124 |
| 129 #endif // UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_ | 125 #endif // UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_ |
| OLD | NEW |