Disable win/ash on high dpi screens

Disable win/ash on high dpi screens

BUG=321694
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236762

[girard, 2013-11-20 18:36:05]

https://codereview.chromium.org/79033002/diff/30001/chrome/browser/ui/toolbar...
File chrome/browser/ui/toolbar/wrench_menu_model.cc (right):

https://codereview.chromium.org/79033002/diff/30001/chrome/browser/ui/toolbar...
chrome/browser/ui/toolbar/wrench_menu_model.cc:545: gfx::GetModernUIScale() ==
1.0f) {
GetUndocumentedDPIScale will identify users that are running with desktop
scaling enabled, but not under --high-dpi-support=1
GetDPIScale will identify users that are running with --high-dpi-support=1 and
with desktop scaling enabled
GetModernUIScale will identify users that have metro scaling enabled

[Ben Goodger (Google), 2013-11-20 18:44:35]

lgtm

https://codereview.chromium.org/79033002/diff/30001/ui/gfx/win/dpi.cc
File ui/gfx/win/dpi.cc (right):

https://codereview.chromium.org/79033002/diff/30001/ui/gfx/win/dpi.cc#newcode74
ui/gfx/win/dpi.cc:74: return static_cast<float>(resolution_scale)/100.0f;
nit spaces around /

[commit-bot: I haz the power, 2013-11-20 18:54:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/80001

[commit-bot: I haz the power, 2013-11-20 18:54:05]

Failed to apply patch for ui/gfx/win/dpi.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/gfx/win/dpi.cc
  Hunk #3 FAILED at 38.
  Hunk #4 succeeded at 169 (offset 10 lines).
  Hunk #5 succeeded at 176 (offset 10 lines).
  1 out of 5 hunks FAILED -- saving rejects to file ui/gfx/win/dpi.cc.rej

Patch:       ui/gfx/win/dpi.cc
Index: ui/gfx/win/dpi.cc
diff --git a/ui/gfx/win/dpi.cc b/ui/gfx/win/dpi.cc
index
e6855283f1dcd03cddc53d66f3fa44ce0b880779..36d93abea7c765fc772218269fff8c982b5f63fe
100644
--- a/ui/gfx/win/dpi.cc
+++ b/ui/gfx/win/dpi.cc
@@ -5,7 +5,12 @@
 #include "ui/gfx/win/dpi.h"
 
 #include <windows.h>
-#include "base/command_line.h"
+#include <wrl\implements.h>
+#include <wrl\wrappers\corewrappers.h>
+#include <windows.foundation.h>
+#include <windows.graphics.display.h>
+#include "base/command_line.h"
+#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/windows_version.h"
 #include "base/win/registry.h"
@@ -14,6 +19,7 @@
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
+#pragma comment(lib, "runtimeobject.lib")
 
 namespace {
 
@@ -32,10 +38,44 @@ BOOL IsProcessDPIAwareWrapper() {
 
 float g_device_scale_factor = 0.0f;
 
+// TODO: Merge this with implementation in win8/metro_driver/winrt_utils.cc
+void CheckHR(HRESULT hr, const char* message) {
+  if (FAILED(hr)) {
+    if (message)
+      PLOG(DFATAL) << message << ", hr = " << std::hex << hr;
+    else
+      PLOG(DFATAL) << "COM ERROR" << ", hr = " << std::hex << hr;
+  }
+}
+
+// TODO: Merge this with implementation in win8/metro_driver/winrt_utils.h
+template<unsigned int size, typename T>
+HRESULT CreateActivationFactory(wchar_t const (&class_name)[size], T** object)
{
+  Microsoft::WRL::Wrappers::HStringReference ref_class_name(class_name);
+  return ABI::Windows::Foundation::GetActivationFactory(ref_class_name.Get(),
+      object);
+}
+
+
 }  // namespace
 
 namespace gfx {
 
+float GetModernUIScale() {
+  base::win::ScopedCOMInitializer com_init;
+  Microsoft::WRL::ComPtr<
+      ABI::Windows::Graphics::Display::IDisplayPropertiesStatics>
+      display_properties;
+  if (SUCCEEDED(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;
+}
+
 void InitDeviceScaleFactor(float scale) {
   DCHECK_NE(0.0f, scale);
   g_device_scale_factor = scale;
@@ -153,7 +193,6 @@ double GetUndocumentedDPIScale() {
   return scale;
 }
 
-
 double GetUndocumentedDPITouchScale() {
   static double scale =
       (base::win::GetVersion() < base::win::VERSION_WIN8_1) ?
@@ -161,6 +200,5 @@ double GetUndocumentedDPITouchScale() {
   return scale;
 }
 
-
 }  // namespace win
 }  // namespace gfx

[commit-bot: I haz the power, 2013-11-20 19:55:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/120001

[commit-bot: I haz the power, 2013-11-20 21:44:33]

Retried try job too often on win_rel for step(s) telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-20 22:03:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/120001

[commit-bot: I haz the power, 2013-11-21 02:10:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/120001

[commit-bot: I haz the power, 2013-11-21 04:33:40]

Retried try job too often on win_rel for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-21 14:53:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/120001

[commit-bot: I haz the power, 2013-11-21 16:00:35]

Retried try job too often on win_rel for step(s) telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-21 16:45:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/120001

[commit-bot: I haz the power, 2013-11-21 18:11:05]

Retried try job too often on win_rel for step(s) telemetry_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-22 10:00:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/79033002/600001

[girard, 2013-11-22 10:03:24]

Had to revise this so it would run under Win7 and earlier. Moved win8-dependent
code into the driver, and dynamically load it from dpi.cc.

PTAL, and I'd be happy to address any issues.

[commit-bot: I haz the power, 2013-11-22 13:23:01]

Change committed as 236762