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

Side by Side Diff: ash/display/display_layout.h

Issue 1638413007: Use list instead of pair to represent the set of displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build error Created 4 years, 10 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 ASH_DISPLAY_DISPLAY_LAYOUT_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_LAYOUT_H_
6 #define ASH_DISPLAY_DISPLAY_LAYOUT_H_ 6 #define ASH_DISPLAY_DISPLAY_LAYOUT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map>
11 #include <string> 10 #include <string>
11 #include <vector>
12 12
13 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 15
16 namespace base { 16 namespace base {
17 class Value; 17 class Value;
18 template <typename T> class JSONValueConverter; 18 template <typename T> class JSONValueConverter;
19 } 19 }
20 20
21 namespace ash { 21 namespace ash {
22 22
23 typedef std::pair<int64_t, int64_t> DisplayIdPair; 23 typedef std::vector<int64_t> DisplayIdList;
24 24
25 struct ASH_EXPORT DisplayLayout { 25 struct ASH_EXPORT DisplayLayout {
26 // Layout options where the secondary display should be positioned. 26 // Layout options where the secondary display should be positioned.
27 enum Position { 27 enum Position {
28 TOP, 28 TOP,
29 RIGHT, 29 RIGHT,
30 BOTTOM, 30 BOTTOM,
31 LEFT 31 LEFT
32 }; 32 };
33 33
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 int64_t primary_id; 67 int64_t primary_id;
68 68
69 // Returns string representation of the layout for debugging/testing. 69 // Returns string representation of the layout for debugging/testing.
70 // This includes "unified" only if the unified desktop feature is enabled. 70 // This includes "unified" only if the unified desktop feature is enabled.
71 std::string ToString() const; 71 std::string ToString() const;
72 }; 72 };
73 73
74 } // namespace ash 74 } // namespace ash
75 75
76 #endif 76 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698