Remove dependency on ui::ScaleFactor from ui/gfx

ash/system/chromeos/network/network_icon.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 "ash/system/chromeos/network/network_icon.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_icon_animation_observer.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 178 matching lines @@
   (*s_empty_bitmaps)[key] = empty;
   return empty;
 }
 
 class EmptyImageSource: public gfx::ImageSkiaSource {
  public:
   explicit EmptyImageSource(const gfx::Size& size)
       : size_(size) {
   }
 
-  virtual gfx::ImageSkiaRep GetImageForScale(
-      ui::ScaleFactor scale_factor) OVERRIDE {
-    gfx::Size pixel_size = gfx::ToFlooredSize(
-        gfx::ScaleSize(size_, ui::GetScaleFactorScale(scale_factor)));
+  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+    gfx::Size pixel_size = gfx::ToFlooredSize(gfx::ScaleSize(size_, scale));
     SkBitmap empty_bitmap = GetEmptyBitmap(pixel_size);
-    return gfx::ImageSkiaRep(empty_bitmap, scale_factor);
+    return gfx::ImageSkiaRep(empty_bitmap, scale);
   }
+
  private:
   const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(EmptyImageSource);
 };
 
 // This defines how we assemble a network icon.
 class NetworkIconImageSource : public gfx::ImageSkiaSource {
  public:
   NetworkIconImageSource(const gfx::ImageSkia& icon, const Badges& badges)
       : icon_(icon),
         badges_(badges) {
   }
   virtual ~NetworkIconImageSource() {}
 
   // TODO(pkotwicz): Figure out what to do when a new image resolution becomes
   // available.
-  virtual gfx::ImageSkiaRep GetImageForScale(
-      ui::ScaleFactor scale_factor) OVERRIDE {
-    gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale_factor);
+  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+    gfx::ImageSkiaRep icon_rep = icon_.GetRepresentation(scale);
     if (icon_rep.is_null())
       return gfx::ImageSkiaRep();
     gfx::Canvas canvas(icon_rep, false);
     if (badges_.top_left)
       canvas.DrawImageInt(*badges_.top_left, 0, 0);
     if (badges_.top_right)
       canvas.DrawImageInt(*badges_.top_right,
                           icon_.width() - badges_.top_right->width(), 0);
     if (badges_.bottom_left) {
       canvas.DrawImageInt(*badges_.bottom_left,
@@ skipping 603 matching lines @@
        iter != networks.end(); ++iter) {
     network_paths.insert((*iter)->path());
   }
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash