Move IsScaleFactorSupported, FindClosestScaleFactorUnsafe to ui/base/resource_bundle.cc

ui/base/layout.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/layout.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 72 matching lines @@
 }
 
 float GetImageScale(ScaleFactor scale_factor) {
 #if defined(OS_WIN)
   if (gfx::IsHighDPIEnabled())
     return gfx::win::GetDeviceScaleFactor();
 #endif
   return GetScaleForScaleFactor(scale_factor);
 }
 
-bool IsScaleFactorSupported(ScaleFactor scale_factor) {
-  DCHECK(g_supported_scale_factors != NULL);
-  return std::find(g_supported_scale_factors->begin(),
-                   g_supported_scale_factors->end(),
-                   scale_factor) != g_supported_scale_factors->end();
-}
-
-// Returns the scale factor closest to |scale| from the full list of factors.
-// Note that it does NOT rely on the list of supported scale factors.
-// Finding the closest match is inefficient and shouldn't be done frequently.
-ScaleFactor FindClosestScaleFactorUnsafe(float scale) {
-  float smallest_diff =  std::numeric_limits<float>::max();
-  ScaleFactor closest_match = SCALE_FACTOR_100P;
-  for (int i = SCALE_FACTOR_100P; i < NUM_SCALE_FACTORS; ++i) {
-    const ScaleFactor scale_factor = static_cast<ScaleFactor>(i);
-    float diff = std::abs(kScaleFactorScales[scale_factor] - scale);
-    if (diff < smallest_diff) {
-      closest_match = scale_factor;
-      smallest_diff = diff;
-    }
-  }
-  return closest_match;
-}
-
 float GetScaleForScaleFactor(ScaleFactor scale_factor) {
   return kScaleFactorScales[scale_factor];
 }
 
 namespace test {
 
 ScopedSetSupportedScaleFactors::ScopedSetSupportedScaleFactors(
     const std::vector<ui::ScaleFactor>& new_scale_factors) {
   if (g_supported_scale_factors) {
     original_scale_factors_ =
@@ skipping 21 matching lines @@
   gfx::Screen* screen = gfx::Screen::GetScreenFor(view);
   if (screen->IsDIPEnabled()) {
     gfx::Display display = screen->GetDisplayNearestWindow(view);
     return display.device_scale_factor();
   }
   return 1.0f;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace ui