OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/base/layout.h" | 5 #include "ui/base/layout.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <limits> | 9 #include <limits> |
10 | 10 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 } else if (switch_value != switches::kTouchOptimizedUIAuto) { | 57 } else if (switch_value != switches::kTouchOptimizedUIAuto) { |
58 LOG(ERROR) << "Invalid --touch-optimized-ui option: " << switch_value; | 58 LOG(ERROR) << "Invalid --touch-optimized-ui option: " << switch_value; |
59 } | 59 } |
60 } | 60 } |
61 | 61 |
62 // We use the touch layout only when we are running in Metro mode. | 62 // We use the touch layout only when we are running in Metro mode. |
63 return base::win::IsMetroProcess() && base::win::IsTouchEnabled(); | 63 return base::win::IsMetroProcess() && base::win::IsTouchEnabled(); |
64 } | 64 } |
65 #endif // defined(OS_WIN) | 65 #endif // defined(OS_WIN) |
66 | 66 |
67 const float kScaleFactorScales[] = {1.0f, 1.4f, 1.8f, 2.0f}; | 67 const float kScaleFactorScales[] = {1.0f, 1.0f, 1.4f, 1.8f, 2.0f}; |
68 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales), | 68 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales), |
69 kScaleFactorScales_incorrect_size); | 69 kScaleFactorScales_incorrect_size); |
70 const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales); | 70 const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales); |
71 | 71 |
72 std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { | 72 std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { |
73 static std::vector<ScaleFactor>* supported_scale_factors = | 73 static std::vector<ScaleFactor>* supported_scale_factors = |
74 new std::vector<ScaleFactor>(); | 74 new std::vector<ScaleFactor>(); |
75 if (supported_scale_factors->empty()) { | 75 if (supported_scale_factors->empty()) { |
76 #if !defined(OS_IOS) | 76 #if !defined(OS_IOS) |
77 // On platforms other than iOS, 100P is always a supported scale factor. | 77 // On platforms other than iOS, 100P is always a supported scale factor. |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 const std::vector<ScaleFactor>& supported = | 127 const std::vector<ScaleFactor>& supported = |
128 GetSupportedScaleFactorsInternal(); | 128 GetSupportedScaleFactorsInternal(); |
129 for (size_t i = 0; i < supported.size(); ++i) { | 129 for (size_t i = 0; i < supported.size(); ++i) { |
130 ScaleFactor scale_factor = supported[i]; | 130 ScaleFactor scale_factor = supported[i]; |
131 float diff = std::abs(kScaleFactorScales[scale_factor] - scale); | 131 float diff = std::abs(kScaleFactorScales[scale_factor] - scale); |
132 if (diff < smallest_diff) { | 132 if (diff < smallest_diff) { |
133 closest_match = scale_factor; | 133 closest_match = scale_factor; |
134 smallest_diff = diff; | 134 smallest_diff = diff; |
135 } | 135 } |
136 } | 136 } |
| 137 DCHECK_NE(closest_match, SCALE_FACTOR_NONE); |
137 return closest_match; | 138 return closest_match; |
138 } | 139 } |
139 | 140 |
140 float GetScaleFactorScale(ScaleFactor scale_factor) { | 141 float GetScaleFactorScale(ScaleFactor scale_factor) { |
141 return kScaleFactorScales[scale_factor]; | 142 return kScaleFactorScales[scale_factor]; |
142 } | 143 } |
143 | 144 |
144 ScaleFactor GetMaxScaleFactor() { | 145 ScaleFactor GetMaxScaleFactor() { |
145 #if defined(OS_CHROMEOS) | 146 #if defined(OS_CHROMEOS) |
146 return ResourceBundle::GetSharedInstance().max_scale_factor(); | 147 return ResourceBundle::GetSharedInstance().max_scale_factor(); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 gfx::Screen* screen = gfx::Screen::GetScreenFor(view); | 180 gfx::Screen* screen = gfx::Screen::GetScreenFor(view); |
180 if (screen->IsDIPEnabled()) { | 181 if (screen->IsDIPEnabled()) { |
181 gfx::Display display = screen->GetDisplayNearestWindow(view); | 182 gfx::Display display = screen->GetDisplayNearestWindow(view); |
182 return GetScaleFactorFromScale(display.device_scale_factor()); | 183 return GetScaleFactorFromScale(display.device_scale_factor()); |
183 } | 184 } |
184 return ui::SCALE_FACTOR_100P; | 185 return ui::SCALE_FACTOR_100P; |
185 } | 186 } |
186 #endif // !defined(OS_MACOSX) | 187 #endif // !defined(OS_MACOSX) |
187 | 188 |
188 } // namespace ui | 189 } // namespace ui |
OLD | NEW |