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

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

Issue 11886074: Use correct favicon scale factor on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Split DeviceTelephonyInfo from DeviceDisplayInfo; added SCALE_FACTOR_150P and 300P. Created 7 years, 11 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 | Annotate | Revision Log
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 21 matching lines...) Expand all
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 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 36 // string, html/js files or an image that can be used for any scale factors
37 // (such as wallpapers). 37 // (such as wallpapers).
38 enum ScaleFactor { 38 enum ScaleFactor {
39 SCALE_FACTOR_NONE = 0, 39 SCALE_FACTOR_NONE = 0,
40 SCALE_FACTOR_100P, 40 SCALE_FACTOR_100P,
41 SCALE_FACTOR_140P, 41 SCALE_FACTOR_140P,
42 SCALE_FACTOR_150P,
42 SCALE_FACTOR_180P, 43 SCALE_FACTOR_180P,
43 SCALE_FACTOR_200P, 44 SCALE_FACTOR_200P,
45 SCALE_FACTOR_300P,
44 46
45 NUM_SCALE_FACTORS // This always appears last. 47 NUM_SCALE_FACTORS // This always appears last.
46 }; 48 };
47 49
48 // Returns the float scale value for |scale_factor|. 50 // Returns the float scale value for |scale_factor|.
49 UI_EXPORT float GetScaleFactorScale(ScaleFactor scale_factor); 51 UI_EXPORT float GetScaleFactorScale(ScaleFactor scale_factor);
50 52
51 // Returns the supported ScaleFactor which most closely matches |scale|. 53 // Returns the supported ScaleFactor which most closely matches |scale|.
52 // Converting from float to ScaleFactor is inefficient and should be done as 54 // Converting from float to ScaleFactor is inefficient and should be done as
53 // little as possible. 55 // little as possible.
(...skipping 16 matching lines...) Expand all
70 namespace test { 72 namespace test {
71 73
72 UI_EXPORT void SetSupportedScaleFactors( 74 UI_EXPORT void SetSupportedScaleFactors(
73 const std::vector<ScaleFactor>& scale_factors); 75 const std::vector<ScaleFactor>& scale_factors);
74 76
75 } // namespace test 77 } // namespace test
76 78
77 } // namespace ui 79 } // namespace ui
78 80
79 #endif // UI_BASE_LAYOUT_H_ 81 #endif // UI_BASE_LAYOUT_H_
OLDNEW
« no previous file with comments | « ui/android/ui_jni_registrar.cc ('k') | ui/base/layout.cc » ('j') | ui/base/layout.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698