Send the device scale factor from Windows 8 ASH during initialization via the MetroViewerHostMsg_Se…

ash/display/display_info.cc

 // Copyright (c) 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.
 
 #include <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
@@ skipping 97 matching lines @@
   int x = 0, y = 0, width, height;
   float device_scale_factor = 1.0f;
   if (sscanf(main_spec.c_str(), "%dx%d*%f",
              &width, &height, &device_scale_factor) >= 2 ||
       sscanf(main_spec.c_str(), "%d+%d-%dx%d*%f", &x, &y, &width, &height,
              &device_scale_factor) >= 4) {
     bounds_in_native.SetRect(x, y, width, height);
   } else {
 #if defined(OS_WIN)
     if (gfx::IsHighDPIEnabled()) {
-      device_scale_factor = gfx::GetModernUIScale();
+      device_scale_factor = gfx::GetDPIScale();
     }
 #endif
   }
 
   std::vector<DisplayMode> display_modes;
   if (Tokenize(main_spec, "#", &parts) == 2) {
     size_t native_mode = 0;
     int largest_area = -1;
     float highest_refresh_rate = -1.0f;
     main_spec = parts[0];
@@ skipping 204 matching lines @@
 }
 
 bool DisplayInfo::IsColorProfileAvailable(
     ui::ColorCalibrationProfile profile) const {
   return std::find(available_color_profiles_.begin(),
                    available_color_profiles_.end(),
                    profile) != available_color_profiles_.end();
 }
 
 }  // namespace ash