OLD | NEW |
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 #include <stdio.h> | 5 #include <stdio.h> |
6 #include <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/display/display_info.h" | 9 #include "ash/display/display_info.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
14 #include "ui/gfx/display.h" | 14 #include "ui/gfx/display.h" |
| 15 #include "ui/gfx/dpi.h" |
15 #include "ui/gfx/size_conversions.h" | 16 #include "ui/gfx/size_conversions.h" |
16 #include "ui/gfx/size_f.h" | 17 #include "ui/gfx/size_f.h" |
17 | 18 |
18 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
19 #include "ui/aura/window_tree_host.h" | 20 #include "ui/aura/window_tree_host.h" |
20 #include "ui/gfx/win/dpi.h" | |
21 #endif | 21 #endif |
22 | 22 |
23 namespace ash { | 23 namespace ash { |
24 namespace { | 24 namespace { |
25 | 25 |
26 bool use_125_dsf_for_ui_scaling = false; | 26 bool use_125_dsf_for_ui_scaling = false; |
27 | 27 |
28 // Check the content of |spec| and fill |bounds| and |device_scale_factor|. | 28 // Check the content of |spec| and fill |bounds| and |device_scale_factor|. |
29 // Returns true when |bounds| is found. | 29 // Returns true when |bounds| is found. |
30 bool GetDisplayBounds( | 30 bool GetDisplayBounds( |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 } | 380 } |
381 | 381 |
382 bool DisplayInfo::IsColorProfileAvailable( | 382 bool DisplayInfo::IsColorProfileAvailable( |
383 ui::ColorCalibrationProfile profile) const { | 383 ui::ColorCalibrationProfile profile) const { |
384 return std::find(available_color_profiles_.begin(), | 384 return std::find(available_color_profiles_.begin(), |
385 available_color_profiles_.end(), | 385 available_color_profiles_.end(), |
386 profile) != available_color_profiles_.end(); | 386 profile) != available_color_profiles_.end(); |
387 } | 387 } |
388 | 388 |
389 } // namespace ash | 389 } // namespace ash |
OLD | NEW |