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

Side by Side Diff: ui/display/display.h

Issue 2523723002: Update display::Display::kInvalidDisplayID constant. (Closed)
Patch Set: Fix includes. Created 4 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 | « services/ui/ws/window_tree.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_DISPLAY_H_ 5 #ifndef UI_DISPLAY_DISPLAY_H_
6 #define UI_DISPLAY_DISPLAY_H_ 6 #define UI_DISPLAY_DISPLAY_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ROTATION_SOURCE_UNKNOWN, 59 ROTATION_SOURCE_UNKNOWN,
60 }; 60 };
61 61
62 // Touch support for the display. 62 // Touch support for the display.
63 enum TouchSupport { 63 enum TouchSupport {
64 TOUCH_SUPPORT_UNKNOWN, 64 TOUCH_SUPPORT_UNKNOWN,
65 TOUCH_SUPPORT_AVAILABLE, 65 TOUCH_SUPPORT_AVAILABLE,
66 TOUCH_SUPPORT_UNAVAILABLE, 66 TOUCH_SUPPORT_UNAVAILABLE,
67 }; 67 };
68 68
69 // Use display::kInvalidDisplayId from display_constants.h in new code.
70 // TODO(kylechar): Delete after all references are gone.
71 enum : int64_t { kInvalidDisplayID = display::kInvalidDisplayId };
72
73 // Creates a display with kInvalidDisplayId as default. 69 // Creates a display with kInvalidDisplayId as default.
74 Display(); 70 Display();
75 explicit Display(int64_t id); 71 explicit Display(int64_t id);
76 Display(int64_t id, const gfx::Rect& bounds); 72 Display(int64_t id, const gfx::Rect& bounds);
77 Display(const Display& other); 73 Display(const Display& other);
78 ~Display(); 74 ~Display();
79 75
80 // Returns the forced device scale factor, which is given by 76 // Returns the forced device scale factor, which is given by
81 // "--force-device-scale-factor". 77 // "--force-device-scale-factor".
82 static float GetForcedDeviceScaleFactor(); 78 static float GetForcedDeviceScaleFactor();
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 205
210 #if !defined(OS_IOS) 206 #if !defined(OS_IOS)
211 friend struct mojo::StructTraits<display::mojom::DisplayDataView, 207 friend struct mojo::StructTraits<display::mojom::DisplayDataView,
212 display::Display>; 208 display::Display>;
213 #endif 209 #endif
214 }; 210 };
215 211
216 } // namespace display 212 } // namespace display
217 213
218 #endif // UI_DISPLAY_DISPLAY_H_ 214 #endif // UI_DISPLAY_DISPLAY_H_
OLDNEW
« no previous file with comments | « services/ui/ws/window_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698