Don't return unsupported scales frrom GetScaleFactorFromScale()

ui/base/layout.cc

Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 48bdab67de386a4dd7298d0a11ac4bee0f3e3e15..65ee844f6626d58d1d880534dd1b0ef09977ec23 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -88,6 +88,23 @@ std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() {
   return *supported_scale_factors;
 }
 
+ui::ScaleFactor GetScaleFactorFromScaleInternal(float scale,
+                                                bool includeUnsupported) {

[pkotwicz, 2012/09/19 14:22:10]

Nit: use camel case for variable include_unsupported

+  size_t closest_match = 0;
+  float smallest_diff =  std::numeric_limits<float>::max();
+  for (size_t i = 0; i < kScaleFactorScalesLength; ++i) {
+    if (!includeUnsupported &&
+        !ui::IsScaleFactorSupported(static_cast<ui::ScaleFactor>(i)))
+      continue;
+    float diff = std::abs(kScaleFactorScales[i] - scale);
+    if (diff < smallest_diff) {
+      closest_match = i;
+      smallest_diff = diff;
+    }
+  }
+  return static_cast<ui::ScaleFactor>(closest_match);
+}
+
 }  // namespace
 
 namespace ui {
@@ -110,16 +127,11 @@ DisplayLayout GetDisplayLayout() {
 }
 
 ScaleFactor GetScaleFactorFromScale(float scale) {
-  size_t closest_match = 0;
-  float smallest_diff =  std::numeric_limits<float>::max();
-  for (size_t i = 0; i < kScaleFactorScalesLength; ++i) {
-    float diff = std::abs(kScaleFactorScales[i] - scale);
-    if (diff < smallest_diff) {
-      closest_match = i;
-      smallest_diff = diff;
-    }
-  }
-  return static_cast<ui::ScaleFactor>(closest_match);
+  return GetScaleFactorFromScaleInternal(scale, true);
+}
+
+ScaleFactor GetSupportedScaleFactorFromScale(float scale) {
+  return GetScaleFactorFromScaleInternal(scale, false);
 }
 
 float GetScaleFactorScale(ScaleFactor scale_factor) {