Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

ui/base/layout.h

Index: ui/base/layout.h
diff --git a/ui/base/layout.h b/ui/base/layout.h
index be65e6e038bc7374b83819d438cc1b9417e6c325..ad56d43fc5173c478d988d745ee8c518281b4098 100644
--- a/ui/base/layout.h
+++ b/ui/base/layout.h
@@ -27,6 +27,18 @@ enum DisplayLayout {
 // the .pak file of theme resources to load.
 UI_EXPORT DisplayLayout GetDisplayLayout();
 
+enum ScaleFactor {
+  SCALE_FACTOR_100P,
+
+  // The scale factor used for unscaled binary data, the 1x (default) scale
+  // factor data packs.
+  SCALE_FACTOR_NONE = SCALE_FACTOR_100P,
+
+  SCALE_FACTOR_200P,
+};
+
+UI_EXPORT float GetScaleFactorScale(ScaleFactor scale_factor);

[sky, 2012/05/22 15:49:45]

Add a description of what this does.

[flackr, 2012/05/22 17:29:40]

Done.

+
 }  // namespace ui
 
 #endif  // UI_BASE_LAYOUT_H_