Index: ui/display/manager/display_manager_utilities.cc |
diff --git a/ui/display/manager/display_manager_utilities.cc b/ui/display/manager/display_manager_utilities.cc |
index c84c1066f293cf73bcd806875a7898c22b66a938..7f5737c108d64bd6c53e6b163c58c06efef7b11c 100644 |
--- a/ui/display/manager/display_manager_utilities.cc |
+++ b/ui/display/manager/display_manager_utilities.cc |
@@ -23,14 +23,19 @@ namespace { |
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 { |
@@ -51,6 +56,10 @@ DisplayUIScales GetScalesForDisplay( |
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: |
@@ -61,6 +70,10 @@ DisplayUIScales GetScalesForDisplay( |
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; |