OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "stdafx.h" | 5 #include "stdafx.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <wrl\implements.h> | 8 #include <wrl\implements.h> |
9 #include <wrl\wrappers\corewrappers.h> | 9 #include <wrl\wrappers\corewrappers.h> |
10 #include <windows.foundation.h> | 10 #include <windows.foundation.h> |
11 #include <windows.graphics.display.h> | 11 #include <windows.graphics.display.h> |
12 #include "base/win/scoped_com_initializer.h" | 12 #include "base/win/scoped_com_initializer.h" |
13 #include "ui/gfx/win/dpi.h" | |
13 #include "winrt_utils.h" | 14 #include "winrt_utils.h" |
14 | 15 |
15 #pragma comment(lib, "runtimeobject.lib") | 16 float GetModernUIScale() { |
16 | |
17 extern "C" { | |
18 | |
19 __declspec(dllexport) float GetModernUIScale() { | |
20 base::win::ScopedCOMInitializer com_init; | 17 base::win::ScopedCOMInitializer com_init; |
cpu_(ooo_6.6-7.5)
2014/05/08 21:42:37
is com not initialized ? I think it is.
ananta
2014/05/08 22:51:43
Done.
| |
21 Microsoft::WRL::ComPtr< | 18 Microsoft::WRL::ComPtr< |
22 ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> | 19 ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> |
23 display_properties; | 20 display_properties; |
24 if (SUCCEEDED(winrt_utils::CreateActivationFactory( | 21 if (SUCCEEDED(winrt_utils::CreateActivationFactory( |
25 RuntimeClass_Windows_Graphics_Display_DisplayProperties, | 22 RuntimeClass_Windows_Graphics_Display_DisplayProperties, |
26 display_properties.GetAddressOf()))) { | 23 display_properties.GetAddressOf()))) { |
27 ABI::Windows::Graphics::Display::ResolutionScale resolution_scale; | 24 ABI::Windows::Graphics::Display::ResolutionScale resolution_scale; |
28 if (SUCCEEDED(display_properties->get_ResolutionScale(&resolution_scale))) | 25 if (SUCCEEDED(display_properties->get_ResolutionScale(&resolution_scale))) |
29 return static_cast<float>(resolution_scale) / 100.0f; | 26 return static_cast<float>(resolution_scale) / 100.0f; |
30 } | 27 } |
31 return 1.0f; | 28 return 1.0f; |
32 } | 29 } |
33 | |
34 } | |
OLD | NEW |