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

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

Issue 336863002: Moving input device hotplug event processing outside of ui/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove TouchscreenDelegate references from display_unittests Created 6 years, 3 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_change_observer_chromeos.cc ('k') | ash/display/display_info.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_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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 void set_native(bool native) { native_ = native; } 169 void set_native(bool native) { native_ = native; }
170 bool native() const { return native_; } 170 bool native() const { return native_; }
171 171
172 const std::vector<DisplayMode>& display_modes() const { 172 const std::vector<DisplayMode>& display_modes() const {
173 return display_modes_; 173 return display_modes_;
174 } 174 }
175 void set_display_modes(std::vector<DisplayMode>& display_modes) { 175 void set_display_modes(std::vector<DisplayMode>& display_modes) {
176 display_modes_.swap(display_modes); 176 display_modes_.swap(display_modes);
177 } 177 }
178 178
179 // Returns the native mode size. If a native mode is not present, return an
180 // empty size.
181 gfx::Size GetNativeModeSize() const;
182
179 ui::ColorCalibrationProfile color_profile() const { 183 ui::ColorCalibrationProfile color_profile() const {
180 return color_profile_; 184 return color_profile_;
181 } 185 }
182 186
183 // Sets the color profile. It will ignore if the specified |profile| is not in 187 // Sets the color profile. It will ignore if the specified |profile| is not in
184 // |available_color_profiles_|. 188 // |available_color_profiles_|.
185 void SetColorProfile(ui::ColorCalibrationProfile profile); 189 void SetColorProfile(ui::ColorCalibrationProfile profile);
186 190
187 // Returns true if |profile| is in |available_color_profiles_|. 191 // Returns true if |profile| is in |available_color_profiles_|.
188 bool IsColorProfileAvailable(ui::ColorCalibrationProfile profile) const; 192 bool IsColorProfileAvailable(ui::ColorCalibrationProfile profile) const;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // The current profile of the color calibration. 263 // The current profile of the color calibration.
260 ui::ColorCalibrationProfile color_profile_; 264 ui::ColorCalibrationProfile color_profile_;
261 265
262 // The list of available variations for the color calibration. 266 // The list of available variations for the color calibration.
263 std::vector<ui::ColorCalibrationProfile> available_color_profiles_; 267 std::vector<ui::ColorCalibrationProfile> available_color_profiles_;
264 }; 268 };
265 269
266 } // namespace ash 270 } // namespace ash
267 271
268 #endif // ASH_DISPLAY_DISPLAY_INFO_H_ 272 #endif // ASH_DISPLAY_DISPLAY_INFO_H_
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698