Fix high-DPI on Windows to make use of DIP scaling in WebKit.

ui/base/layout.cc

 // Copyright (c) 2012 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.
 
 #include "ui/base/layout.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 72 matching lines @@
     if (display.device_scale_factor() > 1.0) {
       DCHECK_EQ(2.0, display.device_scale_factor());
       supported_scale_factors->push_back(SCALE_FACTOR_200P);
     } else {
       supported_scale_factors->push_back(SCALE_FACTOR_100P);
     }
 #elif defined(OS_MACOSX)
     if (base::mac::IsOSLionOrLater())
       supported_scale_factors->push_back(SCALE_FACTOR_200P);
 #elif defined(OS_WIN) && defined(ENABLE_HIDPI)
-    if (base::win::IsMetroProcess() && base::win::IsTouchEnabled()) {
-      supported_scale_factors->push_back(SCALE_FACTOR_140P);
-      supported_scale_factors->push_back(SCALE_FACTOR_180P);
-    }
+    supported_scale_factors->push_back(SCALE_FACTOR_140P);
+    supported_scale_factors->push_back(SCALE_FACTOR_180P);
 #elif defined(OS_CHROMEOS)
     // TODO(oshima): Include 200P only if the device support 200P
     supported_scale_factors->push_back(SCALE_FACTOR_200P);
 #endif
     std::sort(supported_scale_factors->begin(),
               supported_scale_factors->end(),
               ScaleFactorComparator);
   }
   return *supported_scale_factors;
 }
@@ skipping 74 matching lines @@
   gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
   if (screen->IsDIPEnabled()) {
     gfx::Display display = screen->GetDisplayNearestWindow(view);
     return GetScaleFactorFromScale(display.device_scale_factor());
   }
   return ui::SCALE_FACTOR_100P;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui