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

Unified Diff: win8/metro_driver/display_properties.cc

Issue 227573007: Third part of porting Chrome Ash to Windows 7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lf Created 6 years, 8 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
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..6cba9c7319643867cfe580989c8f25365e7a4141 100644
--- a/win8/metro_driver/display_properties.cc
+++ b/win8/metro_driver/display_properties.cc
@@ -10,6 +10,7 @@
#include <windows.foundation.h>
#include <windows.graphics.display.h>
#include "base/win/scoped_com_initializer.h"
+#include "base/win/windows_version.h"
#include "winrt_utils.h"
#pragma comment(lib, "runtimeobject.lib")
@@ -17,6 +18,9 @@
extern "C" {
__declspec(dllexport) float GetModernUIScale() {
+ if (base::win::GetVersion() < base::win::VERSION_WIN8)
ananta 2014/04/11 02:25:24 Please put a todo here to return the correct dpi s
+ return 1.0f;
+
base::win::ScopedCOMInitializer com_init;
Microsoft::WRL::ComPtr<
ABI::Windows::Graphics::Display::IDisplayPropertiesStatics>

Powered by Google App Engine
This is Rietveld 408576698