Add 1.6x mode.

ui/display/manager/display_manager_utilities.cc

 // Copyright 2016 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/display/manager/display_manager_utilities.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/sys_info.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/size_f.h"
 
 namespace display {
 
 namespace {
 
 // List of value UI Scale values. Scales for 2x are equivalent to 640,
 // 800, 1024, 1280, 1440, 1600 and 1920 pixel width respectively on
 // 2560 pixel width 2x density display. Please see crbug.com/233375
 // for the full list of resolutions.
 constexpr float kUIScalesFor2x[] = {0.5f,   0.625f, 0.8f, 1.0f,
                                     1.125f, 1.25f,  1.5f, 2.0f};
 constexpr float kUIScalesFor1_25x[] = {0.5f, 0.625f, 0.8f, 1.0f, 1.25f};
+constexpr float kUIScalesFor1_6x[] = {0.5f, 0.8f, 1.0f, 1.2f, 1.6f};
+
 constexpr float kUIScalesFor1280[] = {0.5f, 0.625f, 0.8f, 1.0f, 1.125f};
 constexpr float kUIScalesFor1366[] = {0.5f, 0.6f, 0.75f, 1.0f, 1.125f};
+constexpr float kUIScalesForFHD[] = {0.5f, 0.625f, 0.8f, 1.0f, 1.25f};
 
 // The default UI scales for the above display densities.
 constexpr float kDefaultUIScaleFor2x = 1.0f;
 constexpr float kDefaultUIScaleFor1_25x = 0.8f;
+constexpr float kDefaultUIScaleFor1_6x = 1.0f;
 constexpr float kDefaultUIScaleFor1280 = 1.0f;
 constexpr float kDefaultUIScaleFor1366 = 1.0f;
+constexpr float kDefaultUIScaleForFHD = 1.0f;
 
 // Encapsulates the list of UI scales and the default one.
 struct DisplayUIScales {
   std::vector<float> scales;
   float default_scale;
 };
 
 DisplayUIScales GetScalesForDisplay(
     const scoped_refptr<ManagedDisplayMode>& native_mode) {
 #define ASSIGN_ARRAY(v, a) v.assign(a, a + arraysize(a))
 
   DisplayUIScales ret;
   if (native_mode->device_scale_factor() == 2.0f) {
     ASSIGN_ARRAY(ret.scales, kUIScalesFor2x);
     ret.default_scale = kDefaultUIScaleFor2x;
     return ret;
   } else if (native_mode->device_scale_factor() == 1.25f) {
     ASSIGN_ARRAY(ret.scales, kUIScalesFor1_25x);
     ret.default_scale = kDefaultUIScaleFor1_25x;
     return ret;
+  } else if (native_mode->device_scale_factor() == 1.6f) {
+    ASSIGN_ARRAY(ret.scales, kUIScalesFor1_6x);
+    ret.default_scale = kDefaultUIScaleFor1_6x;
+    return ret;
   }
   switch (native_mode->size().width()) {
     case 1280:
       ASSIGN_ARRAY(ret.scales, kUIScalesFor1280);
       ret.default_scale = kDefaultUIScaleFor1280;
       break;
     case 1366:
       ASSIGN_ARRAY(ret.scales, kUIScalesFor1366);
       ret.default_scale = kDefaultUIScaleFor1366;
       break;
+    case 1980:
+      ASSIGN_ARRAY(ret.scales, kUIScalesForFHD);
+      ret.default_scale = kDefaultUIScaleForFHD;
+      break;
     default:
       ASSIGN_ARRAY(ret.scales, kUIScalesFor1280);
       ret.default_scale = kDefaultUIScaleFor1280;
 #if defined(OS_CHROMEOS)
       if (base::SysInfo::IsRunningOnChromeOS())
         NOTREACHED() << "Unknown resolution:" << native_mode->size().ToString();
 #endif
   }
   return ret;
 }
@@ skipping 207 matching lines @@
   std::stringstream s;
   const char* sep = "";
   for (int64_t id : list) {
     s << sep << id;
     sep = ",";
   }
   return s.str();
 }
 
 }  // namespace display