Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/ui/views/controls/glow_hover_controller.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/views/controls/glow_hover_controller.h"
 
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
@@ skipping 65 matching lines @@
   return animation_.IsShowing() || animation_.is_animating();
 }
 
 void GlowHoverController::Draw(gfx::Canvas* canvas,
                                const gfx::ImageSkia& mask_image) const {
   if (!ShouldDraw())
     return;
 
   // Draw a radial gradient to hover_canvas.
   gfx::Canvas hover_canvas(gfx::Size(mask_image.width(), mask_image.height()),
-                           canvas->image_scale(),
+                           canvas->scale_factor(),
                            false);
 
   // Draw a radial gradient to hover_canvas.
   int radius = view_->width() / 3;
 
   SkPoint center_point;
   center_point.iset(location_.x(), location_.y());
   SkColor colors[2];
   int hover_alpha =
       static_cast<int>(255 * opacity_scale_ * animation_.GetCurrentValue());
@@ skipping 22 matching lines @@
 
 void GlowHoverController::AnimationEnded(const gfx::Animation* animation) {
   view_->SchedulePaint();
 }
 
 void GlowHoverController::AnimationProgressed(const gfx::Animation* animation) {
   view_->SchedulePaint();
 }
 
 }  // namespace views