Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: ui/base/layout.cc

Issue 327503003: Added 250p scale factor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 17 matching lines...) Expand all
28 28
29 namespace { 29 namespace {
30 30
31 bool ScaleFactorComparator(const ScaleFactor& lhs, const ScaleFactor& rhs){ 31 bool ScaleFactorComparator(const ScaleFactor& lhs, const ScaleFactor& rhs){
32 return GetScaleForScaleFactor(lhs) < GetScaleForScaleFactor(rhs); 32 return GetScaleForScaleFactor(lhs) < GetScaleForScaleFactor(rhs);
33 } 33 }
34 34
35 std::vector<ScaleFactor>* g_supported_scale_factors = NULL; 35 std::vector<ScaleFactor>* g_supported_scale_factors = NULL;
36 36
37 const float kScaleFactorScales[] = {1.0f, 1.0f, 1.25f, 1.33f, 1.4f, 1.5f, 1.8f, 37 const float kScaleFactorScales[] = {1.0f, 1.0f, 1.25f, 1.33f, 1.4f, 1.5f, 1.8f,
38 2.0f, 3.0f}; 38 2.0f, 2.5f, 3.0f};
39 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales), 39 COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
40 kScaleFactorScales_incorrect_size); 40 kScaleFactorScales_incorrect_size);
41 41
42 } // namespace 42 } // namespace
43 43
44 void SetSupportedScaleFactors( 44 void SetSupportedScaleFactors(
45 const std::vector<ui::ScaleFactor>& scale_factors) { 45 const std::vector<ui::ScaleFactor>& scale_factors) {
46 if (g_supported_scale_factors != NULL) 46 if (g_supported_scale_factors != NULL)
47 delete g_supported_scale_factors; 47 delete g_supported_scale_factors;
48 48
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 gfx::Screen* screen = gfx::Screen::GetScreenFor(view); 124 gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
125 if (screen->IsDIPEnabled()) { 125 if (screen->IsDIPEnabled()) {
126 gfx::Display display = screen->GetDisplayNearestWindow(view); 126 gfx::Display display = screen->GetDisplayNearestWindow(view);
127 return display.device_scale_factor(); 127 return display.device_scale_factor();
128 } 128 }
129 return 1.0f; 129 return 1.0f;
130 } 130 }
131 #endif // !defined(OS_MACOSX) 131 #endif // !defined(OS_MACOSX)
132 132
133 } // namespace ui 133 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698