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

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

Issue 455443002: Remember the configured device scale factor for external displays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 4 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 | « ash/display/display_info_unittest.cc ('k') | ash/display/display_manager.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) 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 ASH_DISPLAY_DISPLAY_MANAGER_H_ 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_
6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 // case the new resolution actually doesn't work. 175 // case the new resolution actually doesn't work.
176 bool SetDisplayMode(int64 display_id, const DisplayMode& display_mode); 176 bool SetDisplayMode(int64 display_id, const DisplayMode& display_mode);
177 177
178 // Register per display properties. |overscan_insets| is NULL if 178 // Register per display properties. |overscan_insets| is NULL if
179 // the display has no custom overscan insets. 179 // the display has no custom overscan insets.
180 void RegisterDisplayProperty(int64 display_id, 180 void RegisterDisplayProperty(int64 display_id,
181 gfx::Display::Rotation rotation, 181 gfx::Display::Rotation rotation,
182 float ui_scale, 182 float ui_scale,
183 const gfx::Insets* overscan_insets, 183 const gfx::Insets* overscan_insets,
184 const gfx::Size& resolution_in_pixels, 184 const gfx::Size& resolution_in_pixels,
185 float device_scale_factor,
185 ui::ColorCalibrationProfile color_profile); 186 ui::ColorCalibrationProfile color_profile);
186 187
187 // Returns the display mode of |display_id| which is currently used. 188 // Returns the display mode of |display_id| which is currently used.
188 DisplayMode GetActiveModeForDisplayId(int64 display_id) const; 189 DisplayMode GetActiveModeForDisplayId(int64 display_id) const;
189 190
190 // Returns the display's selected mode. This returns false and doesn't 191 // Returns the display's selected mode. This returns false and doesn't
191 // set |mode_out| if the display mode is in default. 192 // set |mode_out| if the display mode is in default.
192 bool GetSelectedModeForDisplayId(int64 display_id, 193 bool GetSelectedModeForDisplayId(int64 display_id,
193 DisplayMode* mode_out) const; 194 DisplayMode* mode_out) const;
194 195
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 SecondDisplayMode second_display_mode_; 374 SecondDisplayMode second_display_mode_;
374 int64 mirrored_display_id_; 375 int64 mirrored_display_id_;
375 gfx::Display non_desktop_display_; 376 gfx::Display non_desktop_display_;
376 377
377 DISALLOW_COPY_AND_ASSIGN(DisplayManager); 378 DISALLOW_COPY_AND_ASSIGN(DisplayManager);
378 }; 379 };
379 380
380 } // namespace ash 381 } // namespace ash
381 382
382 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ 383 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/display/display_info_unittest.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698