Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/thumbnails/simple_thumbnail_crop.cc

 // Copyright (c) 2013 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 "chrome/browser/thumbnails/simple_thumbnail_crop.h"
 
 #include "base/metrics/histogram.h"
 #include "content/public/browser/browser_thread.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 static const char kThumbnailHistogramName[] = "Thumbnail.ComputeMS";
 }
 
 namespace thumbnails {
@@ skipping 93 matching lines @@
 // TODO(mazda): Copy the pixels with the smaller size in the case of
 // ui::SCALE_FACTOR_100P once the resampling method has been improved.
 // static
 gfx::Size SimpleThumbnailCrop::GetCopySizeForThumbnail(
     ui::ScaleFactor scale_factor,
     const gfx::Size& thumbnail_size) {
   gfx::Size copy_size(thumbnail_size);
   switch (scale_factor) {
     case ui::SCALE_FACTOR_100P:
       copy_size = gfx::ToFlooredSize(gfx::ScaleSize(
-          copy_size, ui::GetScaleFactorScale(ui::SCALE_FACTOR_200P)));
+          copy_size, ui::GetImageScale(ui::SCALE_FACTOR_200P)));
       break;
     case ui::SCALE_FACTOR_200P:
       // Use the size as-is.
       break;
     default:
       DLOG(WARNING) << "Unsupported scale factor. Use the same copy size as "
                     << "ui::SCALE_FACTOR_100P";
       copy_size = gfx::ToFlooredSize(gfx::ScaleSize(
-          copy_size, ui::GetMaxScaleFactor()));
+          copy_size, gfx::ImageSkia::GetMaxSupportedScale()));
       break;
   }
   return copy_size;
 }
 
 gfx::Rect SimpleThumbnailCrop::GetClippingRect(const gfx::Size& source_size,
                                                const gfx::Size& desired_size,
                                                ClipResult* clip_result) {
   DCHECK(clip_result);
 
@@ skipping 32 matching lines @@
     }
   }
   return clipping_rect;
 }
 
 // static
 gfx::Size SimpleThumbnailCrop::ComputeTargetSizeAtMaximumScale(
     const gfx::Size& given_size) {
   // TODO(mazda|oshima): Update thumbnail when the max scale factor changes.
   // crbug.com/159157.
-  float max_scale_factor =
-      ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
+  float max_scale_factor = gfx::ImageSkia::GetMaxSupportedScale();
   return gfx::ToFlooredSize(gfx::ScaleSize(given_size, max_scale_factor));
 }
 
 SimpleThumbnailCrop::~SimpleThumbnailCrop() {
 }
 
 // Creates a downsampled thumbnail from the given bitmap.
 // store. The returned bitmap will be isNull if there was an error creating it.
 SkBitmap SimpleThumbnailCrop::CreateThumbnail(const SkBitmap& bitmap,
                                               const gfx::Size& desired_size,
@@ skipping 40 matching lines @@
       clipped_bitmap.height() == result.height())
     clipped_bitmap.copyTo(&result, SkBitmap::kARGB_8888_Config);
 #endif
 
   HISTOGRAM_TIMES(kThumbnailHistogramName,
                   base::TimeTicks::Now() - begin_compute_thumbnail);
   return result;
 }
 
 } // namespace thumbnails