Chromium Code Reviews| Index: win8/metro_driver/display_properties.cc |
| diff --git a/win8/metro_driver/display_properties.cc b/win8/metro_driver/display_properties.cc |
| index f1653fdbd7b2d61f74de8f08436e0ac4fe2fb44f..b5ce3c408e79f55e2c30f9295e18a79406dd7597 100644 |
| --- a/win8/metro_driver/display_properties.cc |
| +++ b/win8/metro_driver/display_properties.cc |
| @@ -10,13 +10,10 @@ |
| #include <windows.foundation.h> |
| #include <windows.graphics.display.h> |
| #include "base/win/scoped_com_initializer.h" |
| +#include "ui/gfx/win/dpi.h" |
| #include "winrt_utils.h" |
| -#pragma comment(lib, "runtimeobject.lib") |
| - |
| -extern "C" { |
| - |
| -__declspec(dllexport) float GetModernUIScale() { |
| +float GetModernUIScale() { |
| 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.
|
| Microsoft::WRL::ComPtr< |
| ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> |
| @@ -30,5 +27,3 @@ __declspec(dllexport) float GetModernUIScale() { |
| } |
| return 1.0f; |
| } |
| - |
| -} |