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

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

Issue 618283003: Adds special support to the device manager for keyboards devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to master. Created 6 years, 2 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_INFO_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_INFO_H_
6 #define ASH_DISPLAY_DISPLAY_INFO_H_ 6 #define ASH_DISPLAY_DISPLAY_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 bool has_overscan() const { return has_overscan_; } 104 bool has_overscan() const { return has_overscan_; }
105 105
106 void set_rotation(gfx::Display::Rotation rotation) { rotation_ = rotation; } 106 void set_rotation(gfx::Display::Rotation rotation) { rotation_ = rotation; }
107 gfx::Display::Rotation rotation() const { return rotation_; } 107 gfx::Display::Rotation rotation() const { return rotation_; }
108 108
109 void set_touch_support(gfx::Display::TouchSupport support) { 109 void set_touch_support(gfx::Display::TouchSupport support) {
110 touch_support_ = support; 110 touch_support_ = support;
111 } 111 }
112 gfx::Display::TouchSupport touch_support() const { return touch_support_; } 112 gfx::Display::TouchSupport touch_support() const { return touch_support_; }
113 113
114 void set_touch_device_id(int id) { touch_device_id_ = id; } 114 void set_touch_device_id(unsigned int id) { touch_device_id_ = id; }
115 int touch_device_id() const { return touch_device_id_; } 115 unsigned int touch_device_id() const { return touch_device_id_; }
116 116
117 // Gets/Sets the device scale factor of the display. 117 // Gets/Sets the device scale factor of the display.
118 float device_scale_factor() const { return device_scale_factor_; } 118 float device_scale_factor() const { return device_scale_factor_; }
119 void set_device_scale_factor(float scale) { device_scale_factor_ = scale; } 119 void set_device_scale_factor(float scale) { device_scale_factor_ = scale; }
120 120
121 // The native bounds for the display. The size of this can be 121 // The native bounds for the display. The size of this can be
122 // different from the |size_in_pixel| when overscan insets are set 122 // different from the |size_in_pixel| when overscan insets are set
123 // and/or |configured_ui_scale_| is set. 123 // and/or |configured_ui_scale_| is set.
124 const gfx::Rect& bounds_in_native() const { 124 const gfx::Rect& bounds_in_native() const {
125 return bounds_in_native_; 125 return bounds_in_native_;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 private: 222 private:
223 int64 id_; 223 int64 id_;
224 std::string name_; 224 std::string name_;
225 bool has_overscan_; 225 bool has_overscan_;
226 gfx::Display::Rotation rotation_; 226 gfx::Display::Rotation rotation_;
227 gfx::Display::TouchSupport touch_support_; 227 gfx::Display::TouchSupport touch_support_;
228 228
229 // If the display is also a touch device, it will have a positive 229 // If the display is also a touch device, it will have a positive
230 // |touch_device_id_|. Otherwise |touch_device_id_| is 0. 230 // |touch_device_id_|. Otherwise |touch_device_id_| is 0.
231 int touch_device_id_; 231 unsigned int touch_device_id_;
232 232
233 // This specifies the device's pixel density. (For example, a 233 // This specifies the device's pixel density. (For example, a
234 // display whose DPI is higher than the threshold is considered to have 234 // display whose DPI is higher than the threshold is considered to have
235 // device_scale_factor = 2.0 on Chrome OS). This is used by the 235 // device_scale_factor = 2.0 on Chrome OS). This is used by the
236 // grapics layer to choose and draw appropriate images and scale 236 // grapics layer to choose and draw appropriate images and scale
237 // layers properly. 237 // layers properly.
238 float device_scale_factor_; 238 float device_scale_factor_;
239 gfx::Rect bounds_in_native_; 239 gfx::Rect bounds_in_native_;
240 240
241 // The size of the display in use. The size can be different from the size 241 // The size of the display in use. The size can be different from the size
(...skipping 23 matching lines...) Expand all
265 // The current profile of the color calibration. 265 // The current profile of the color calibration.
266 ui::ColorCalibrationProfile color_profile_; 266 ui::ColorCalibrationProfile color_profile_;
267 267
268 // The list of available variations for the color calibration. 268 // The list of available variations for the color calibration.
269 std::vector<ui::ColorCalibrationProfile> available_color_profiles_; 269 std::vector<ui::ColorCalibrationProfile> available_color_profiles_;
270 }; 270 };
271 271
272 } // namespace ash 272 } // namespace ash
273 273
274 #endif // ASH_DISPLAY_DISPLAY_INFO_H_ 274 #endif // ASH_DISPLAY_DISPLAY_INFO_H_
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/touch/touch_transformer_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698