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

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

Issue 106673003: Update the selected resolution to the resolution that is actually selected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update test Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/display/display_manager.h » ('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_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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 93 }
94 gfx::Display::TouchSupport touch_support() const { return touch_support_; } 94 gfx::Display::TouchSupport touch_support() const { return touch_support_; }
95 95
96 // Gets/Sets the device scale factor of the display. 96 // Gets/Sets the device scale factor of the display.
97 float device_scale_factor() const { return device_scale_factor_; } 97 float device_scale_factor() const { return device_scale_factor_; }
98 void set_device_scale_factor(float scale) { device_scale_factor_ = scale; } 98 void set_device_scale_factor(float scale) { device_scale_factor_ = scale; }
99 99
100 // The native bounds for the display. The size of this can be 100 // The native bounds for the display. The size of this can be
101 // different from the |size_in_pixel| when overscan insets are set 101 // different from the |size_in_pixel| when overscan insets are set
102 // and/or |configured_ui_scale_| is set. 102 // and/or |configured_ui_scale_| is set.
103 const gfx::Rect bounds_in_native() const { 103 const gfx::Rect& bounds_in_native() const {
104 return bounds_in_native_; 104 return bounds_in_native_;
105 } 105 }
106 106
107 // The size for the display in pixels. 107 // The size for the display in pixels.
108 const gfx::Size& size_in_pixel() const { return size_in_pixel_; } 108 const gfx::Size& size_in_pixel() const { return size_in_pixel_; }
109 109
110 // The overscan insets for the display in DIP. 110 // The overscan insets for the display in DIP.
111 const gfx::Insets& overscan_insets_in_dip() const { 111 const gfx::Insets& overscan_insets_in_dip() const {
112 return overscan_insets_in_dip_; 112 return overscan_insets_in_dip_;
113 } 113 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 bool native_; 189 bool native_;
190 190
191 // The list of resolutions supported by this display. 191 // The list of resolutions supported by this display.
192 std::vector<Resolution> resolutions_; 192 std::vector<Resolution> resolutions_;
193 }; 193 };
194 194
195 } // namespace internal 195 } // namespace internal
196 } // namespace ash 196 } // namespace ash
197 197
198 #endif // ASH_DISPLAY_DISPLAY_INFO_H_ 198 #endif // ASH_DISPLAY_DISPLAY_INFO_H_
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698