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

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

Issue 11301007: Load the resources for max scale factor first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/web_ui_util_unittest.cc ('k') | ui/base/layout.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 #ifndef UI_BASE_LAYOUT_H_ 5 #ifndef UI_BASE_LAYOUT_H_
6 #define UI_BASE_LAYOUT_H_ 6 #define UI_BASE_LAYOUT_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 14 matching lines...) Expand all
25 LAYOUT_TOUCH, 25 LAYOUT_TOUCH,
26 }; 26 };
27 27
28 // Returns the display layout that should be used. This could be used 28 // Returns the display layout that should be used. This could be used
29 // e.g. to tweak hard-coded padding that's layout specific, or choose 29 // e.g. to tweak hard-coded padding that's layout specific, or choose
30 // the .pak file of theme resources to load. 30 // the .pak file of theme resources to load.
31 UI_EXPORT DisplayLayout GetDisplayLayout(); 31 UI_EXPORT DisplayLayout GetDisplayLayout();
32 32
33 // Supported UI scale factors for the platform. This is used as an index 33 // Supported UI scale factors for the platform. This is used as an index
34 // into the array |kScaleFactorScales| which maps the enum value to a float. 34 // into the array |kScaleFactorScales| which maps the enum value to a float.
35 // SCALE_FACTOR_NONE is used for density independent resources such as
36 // string, html/js files or an image that can be used for any scale factors
37 // (such as wallpapers).
35 enum ScaleFactor { 38 enum ScaleFactor {
36 SCALE_FACTOR_100P = 0, 39 SCALE_FACTOR_NONE = 0,
37 40 SCALE_FACTOR_100P,
38 // The scale factor used for unscaled binary data, the 1x (default) scale
39 // factor data packs.
40 SCALE_FACTOR_NONE = SCALE_FACTOR_100P,
41 SCALE_FACTOR_140P, 41 SCALE_FACTOR_140P,
42 SCALE_FACTOR_180P, 42 SCALE_FACTOR_180P,
43 SCALE_FACTOR_200P, 43 SCALE_FACTOR_200P,
44 44
45 NUM_SCALE_FACTORS // This always appears last. 45 NUM_SCALE_FACTORS // This always appears last.
46 }; 46 };
47 47
48 // Returns the float scale value for |scale_factor|. 48 // Returns the float scale value for |scale_factor|.
49 UI_EXPORT float GetScaleFactorScale(ScaleFactor scale_factor); 49 UI_EXPORT float GetScaleFactorScale(ScaleFactor scale_factor);
50 50
51 // Returns the supported ScaleFactor which most closely matches |scale|. 51 // Returns the supported ScaleFactor which most closely matches |scale|.
52 // Converting from float to ScaleFactor is inefficient and should be done as 52 // Converting from float to ScaleFactor is inefficient and should be done as
53 // little as possible. 53 // little as possible.
54 // TODO(oshima): Make ScaleFactor a class and remove this.
54 UI_EXPORT ScaleFactor GetScaleFactorFromScale(float scale); 55 UI_EXPORT ScaleFactor GetScaleFactorFromScale(float scale);
55 56
56 // Returns the ScaleFactor used by |view|. 57 // Returns the ScaleFactor used by |view|.
57 UI_EXPORT ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view); 58 UI_EXPORT ScaleFactor GetScaleFactorForNativeView(gfx::NativeView view);
58 59
59 // Returns the maximum device scale factor supported by this platform. 60 // Returns the maximum device scale factor supported by this platform.
60 UI_EXPORT ScaleFactor GetMaxScaleFactor(); 61 UI_EXPORT ScaleFactor GetMaxScaleFactor();
61 62
62 // Returns a vector with the scale factors which are supported by this 63 // Returns a vector with the scale factors which are supported by this
63 // platform, in ascending order. 64 // platform, in ascending order.
64 UI_EXPORT std::vector<ScaleFactor> GetSupportedScaleFactors(); 65 UI_EXPORT std::vector<ScaleFactor> GetSupportedScaleFactors();
65 66
66 // Returns true if |scale_factor| is supported by this platform. 67 // Returns true if |scale_factor| is supported by this platform.
67 UI_EXPORT bool IsScaleFactorSupported(ScaleFactor scale_factor); 68 UI_EXPORT bool IsScaleFactorSupported(ScaleFactor scale_factor);
68 69
69 namespace test { 70 namespace test {
70 71
71 UI_EXPORT void SetSupportedScaleFactors( 72 UI_EXPORT void SetSupportedScaleFactors(
72 const std::vector<ScaleFactor>& scale_factors); 73 const std::vector<ScaleFactor>& scale_factors);
73 74
74 } // namespace test 75 } // namespace test
75 76
76 } // namespace ui 77 } // namespace ui
77 78
78 #endif // UI_BASE_LAYOUT_H_ 79 #endif // UI_BASE_LAYOUT_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/web_ui_util_unittest.cc ('k') | ui/base/layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698