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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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 | « ash/display/display_info.cc ('k') | ash/display/display_layout.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
9
8 #include <map> 10 #include <map>
9 #include <string> 11 #include <string>
10 12
11 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 15
15 namespace base { 16 namespace base {
16 class Value; 17 class Value;
17 template <typename T> class JSONValueConverter; 18 template <typename T> class JSONValueConverter;
18 } 19 }
19 20
20 namespace ash { 21 namespace ash {
21 22
22 typedef std::pair<int64, int64> DisplayIdPair; 23 typedef std::pair<int64_t, int64_t> DisplayIdPair;
23 24
24 struct ASH_EXPORT DisplayLayout { 25 struct ASH_EXPORT DisplayLayout {
25 // Layout options where the secondary display should be positioned. 26 // Layout options where the secondary display should be positioned.
26 enum Position { 27 enum Position {
27 TOP, 28 TOP,
28 RIGHT, 29 RIGHT,
29 BOTTOM, 30 BOTTOM,
30 LEFT 31 LEFT
31 }; 32 };
32 33
(...skipping 23 matching lines...) Expand all
56 // based on the top/left edge of the primary display. 57 // based on the top/left edge of the primary display.
57 int offset; 58 int offset;
58 59
59 // True if displays are mirrored. 60 // True if displays are mirrored.
60 bool mirrored; 61 bool mirrored;
61 62
62 // True if multi displays should default to unified mode. 63 // True if multi displays should default to unified mode.
63 bool default_unified; 64 bool default_unified;
64 65
65 // The id of the display used as a primary display. 66 // The id of the display used as a primary display.
66 int64 primary_id; 67 int64_t primary_id;
67 68
68 // Returns string representation of the layout for debugging/testing. 69 // Returns string representation of the layout for debugging/testing.
69 // This includes "unified" only if the unified desktop feature is enabled. 70 // This includes "unified" only if the unified desktop feature is enabled.
70 std::string ToString() const; 71 std::string ToString() const;
71 }; 72 };
72 73
73 } // namespace ash 74 } // namespace ash
74 75
75 #endif 76 #endif
OLDNEW
« no previous file with comments | « ash/display/display_info.cc ('k') | ash/display/display_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698