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

trunk/src/ash/wm/frame_painter.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/wm/frame_painter.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
@@ skipping 118 matching lines @@
       overlay_bounds.Intersect(
           gfx::Rect(bounds.origin(), frame_overlay_image->size()));
       int top_left_corner_radius = corner_radius;
       int top_right_corner_radius = corner_radius;
       if (overlay_bounds.width() < bounds.width() - corner_radius)
         top_right_corner_radius = 0;
       TileRoundRect(canvas, *frame_overlay_image, paint, overlay_bounds,
           top_left_corner_radius, top_right_corner_radius, 0);
     }
   } else {
-    gfx::Canvas temporary_canvas(bounds.size(), canvas->image_scale(), false);
+    gfx::Canvas temporary_canvas(bounds.size(), canvas->scale_factor(), false);
     temporary_canvas.TileImageInt(*frame_image,
                                   image_inset_x, 0,
                                   0, 0,
                                   bounds.width(), bounds.height());
     temporary_canvas.DrawImageInt(*frame_overlay_image, 0, 0);
     TileRoundRect(canvas, gfx::ImageSkia(temporary_canvas.ExtractImageRep()),
         paint, bounds, corner_radius, corner_radius, 0);
   }
 }
 
@@ skipping 690 matching lines @@
   // icon. Don't use |window_icon_| for this computation as it may be NULL.
   int title_y = GetCaptionButtonContainerCenterY() - title_font.GetHeight() / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, caption_button_container_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash