summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authorgirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 15:09:02 +0000
committergirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 15:09:02 +0000
commit78c352ade4b70c53475270d57c85c51d7fc08671 (patch)
tree42c22bb107a0554f41f3f54cf9ca069c1d5d7b9c /win8
parenta7a74b2f89d1fbd39b58cfb713c695e704ccd62e (diff)
downloadchromium_src-78c352ade4b70c53475270d57c85c51d7fc08671.zip
chromium_src-78c352ade4b70c53475270d57c85c51d7fc08671.tar.gz
chromium_src-78c352ade4b70c53475270d57c85c51d7fc08671.tar.bz2
Correct the operation of the --high-dpi-support=1 flag under win/ash.
BUG=319941 Review URL: https://codereview.chromium.org/59213007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
-rw-r--r--win8/metro_driver/display_properties.cc2
-rw-r--r--win8/metro_driver/display_properties.h11
-rw-r--r--win8/metro_driver/metro_driver.gyp1
3 files changed, 13 insertions, 1 deletions
diff --git a/win8/metro_driver/display_properties.cc b/win8/metro_driver/display_properties.cc
index a7cf427..f1653fd 100644
--- a/win8/metro_driver/display_properties.cc
+++ b/win8/metro_driver/display_properties.cc
@@ -16,7 +16,7 @@
extern "C" {
- __declspec(dllexport) float GetModernUIScale() {
+__declspec(dllexport) float GetModernUIScale() {
base::win::ScopedCOMInitializer com_init;
Microsoft::WRL::ComPtr<
ABI::Windows::Graphics::Display::IDisplayPropertiesStatics>
diff --git a/win8/metro_driver/display_properties.h b/win8/metro_driver/display_properties.h
new file mode 100644
index 0000000..1491b3f
--- /dev/null
+++ b/win8/metro_driver/display_properties.h
@@ -0,0 +1,11 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_METRO_DRIVER_DISPLAY_PROPERTIES_H_
+#define CHROME_BROWSER_UI_METRO_DRIVER_DISPLAY_PROPERTIES_H_
+
+// Determines the scale factor used in the modern/metro ui. 1.0 means unscaled.
+extern "C" __declspec(dllexport) float GetModernUIScale();
+
+#endif // CHROME_BROWSER_UI_METRO_DRIVER_DISPLAY_PROPERTIES_H_
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp
index cc572d8..f0d1c76 100644
--- a/win8/metro_driver/metro_driver.gyp
+++ b/win8/metro_driver/metro_driver.gyp
@@ -65,6 +65,7 @@
],
'sources': [
'display_properties.cc',
+ 'display_properties.h',
'metro_driver.cc',
'metro_driver.h',
'stdafx.h',