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

Unified Diff: win8/metro_driver/display_properties.cc

Issue 282953003: Support input events in Chrome ASH on Windows 7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed presubmit warnings Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | win8/metro_driver/metro_driver_win7.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/metro_driver/display_properties.cc
diff --git a/win8/metro_driver/display_properties.cc b/win8/metro_driver/display_properties.cc
index 7eb557f6a9164b1caf727fd470080d94490f9730..e1b7ed5e7e03764dfcaa51fd19fe68f1ae6fbfdd 100644
--- a/win8/metro_driver/display_properties.cc
+++ b/win8/metro_driver/display_properties.cc
@@ -9,19 +9,22 @@
#include <wrl\wrappers\corewrappers.h>
#include <windows.foundation.h>
#include <windows.graphics.display.h>
+#include "base/win/windows_version.h"
#include "ui/gfx/win/dpi.h"
#include "winrt_utils.h"
float GetModernUIScale() {
- Microsoft::WRL::ComPtr<
- ABI::Windows::Graphics::Display::IDisplayPropertiesStatics>
- display_properties;
- if (SUCCEEDED(winrt_utils::CreateActivationFactory(
- RuntimeClass_Windows_Graphics_Display_DisplayProperties,
- display_properties.GetAddressOf()))) {
- ABI::Windows::Graphics::Display::ResolutionScale resolution_scale;
- if (SUCCEEDED(display_properties->get_ResolutionScale(&resolution_scale)))
- return static_cast<float>(resolution_scale) / 100.0f;
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+ Microsoft::WRL::ComPtr<
+ ABI::Windows::Graphics::Display::IDisplayPropertiesStatics>
+ display_properties;
+ if (SUCCEEDED(winrt_utils::CreateActivationFactory(
+ RuntimeClass_Windows_Graphics_Display_DisplayProperties,
+ display_properties.GetAddressOf()))) {
+ ABI::Windows::Graphics::Display::ResolutionScale resolution_scale;
+ if (SUCCEEDED(display_properties->get_ResolutionScale(&resolution_scale)))
+ return static_cast<float>(resolution_scale) / 100.0f;
+ }
}
- return 1.0f;
+ return gfx::GetDPIScale();
}
« no previous file with comments | « no previous file | win8/metro_driver/metro_driver_win7.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698