OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ui/gfx/win/display_info.h" | 5 #include "ui/gfx/win/display_info.h" |
6 | 6 |
7 #include "base/hash.h" | 7 #include "base/hash.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 | 9 |
10 namespace { | 10 namespace { |
(...skipping 28 matching lines...) Expand all Loading... |
39 DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info, | 39 DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info, |
40 float device_scale_factor) | 40 float device_scale_factor) |
41 : DisplayInfo(monitor_info, | 41 : DisplayInfo(monitor_info, |
42 device_scale_factor, | 42 device_scale_factor, |
43 GetRotationForDevice(monitor_info.szDevice)) {} | 43 GetRotationForDevice(monitor_info.szDevice)) {} |
44 | 44 |
45 DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info, | 45 DisplayInfo::DisplayInfo(const MONITORINFOEX& monitor_info, |
46 float device_scale_factor, | 46 float device_scale_factor, |
47 gfx::Display::Rotation rotation) | 47 gfx::Display::Rotation rotation) |
48 : id_(DeviceIdFromDeviceName(monitor_info.szDevice)), | 48 : id_(DeviceIdFromDeviceName(monitor_info.szDevice)), |
| 49 rotation_(rotation), |
49 screen_rect_(monitor_info.rcMonitor), | 50 screen_rect_(monitor_info.rcMonitor), |
50 screen_work_rect_(monitor_info.rcWork), | 51 screen_work_rect_(monitor_info.rcWork), |
51 rotation_(rotation), | |
52 device_scale_factor_(device_scale_factor) {} | 52 device_scale_factor_(device_scale_factor) {} |
53 | 53 |
54 // static | 54 // static |
55 int64_t DisplayInfo::DeviceIdFromDeviceName(const wchar_t* device_name) { | 55 int64_t DisplayInfo::DeviceIdFromDeviceName(const wchar_t* device_name) { |
56 return static_cast<int64_t>(base::Hash(base::WideToUTF8(device_name))); | 56 return static_cast<int64_t>(base::Hash(base::WideToUTF8(device_name))); |
57 } | 57 } |
58 | 58 |
59 } // namespace win | 59 } // namespace win |
60 } // namespace gfx | 60 } // namespace gfx |
OLD | NEW |