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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/layout.h
diff --git a/ui/base/layout.h b/ui/base/layout.h
index fcfb974dad22933c310b95215c122da5f8d68903..24663b7bbc130b244c8337182aa7599df82070c1 100644
--- a/ui/base/layout.h
+++ b/ui/base/layout.h
@@ -32,12 +32,12 @@ UI_EXPORT DisplayLayout GetDisplayLayout();
// Supported UI scale factors for the platform. This is used as an index
// into the array |kScaleFactorScales| which maps the enum value to a float.
+// SCALE_FACTOR_NONE is used for density independent resources such as
+// string, html/js files or an image that can be used for any scale factors
+// (such as wallpapers).
enum ScaleFactor {
- SCALE_FACTOR_100P = 0,
-
- // The scale factor used for unscaled binary data, the 1x (default) scale
- // factor data packs.
- SCALE_FACTOR_NONE = SCALE_FACTOR_100P,
+ SCALE_FACTOR_NONE = 0,
+ SCALE_FACTOR_100P,
SCALE_FACTOR_140P,
SCALE_FACTOR_180P,
SCALE_FACTOR_200P,
@@ -51,6 +51,7 @@ UI_EXPORT float GetScaleFactorScale(ScaleFactor scale_factor);
// Returns the supported ScaleFactor which most closely matches |scale|.
// Converting from float to ScaleFactor is inefficient and should be done as
// little as possible.
+// TODO(oshima): Make ScaleFactor a class and remove this.
UI_EXPORT ScaleFactor GetScaleFactorFromScale(float scale);
// Returns the ScaleFactor used by |view|.
« 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