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

trunk/src/chrome/browser/extensions/app_icon_loader_impl.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 "chrome/browser/extensions/app_icon_loader_impl.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 49 matching lines @@
       extensions::IconsInfo::GetIcons(extension),
       icon_size_,
       extensions::IconsInfo::GetDefaultAppIcon(),
       this);
   // |map_| takes ownership of |image|.
   map_[image] = id;
 
   // Triggers image loading now instead of depending on paint message. This
   // makes the temp blank image be shown for shorter time and improves user
   // experience. See http://crbug.com/146114.
-  image->image_skia().EnsureRepsForSupportedScales();
+  image->image_skia().EnsureRepsForSupportedScaleFactors();
 }
 
 void AppIconLoaderImpl::ClearImage(const std::string& id) {
   for (ImageToExtensionIDMap::iterator i = map_.begin();
        i != map_.end(); ++i) {
     if (i->second == id) {
       delete i->first;
       map_.erase(i);
       break;
     }
@@ skipping 28 matching lines @@
   const bool enabled = service->IsExtensionEnabledForLauncher(id);
   if (!enabled) {
     const color_utils::HSL shift = {-1, 0, 0.6};
     image = gfx::ImageSkiaOperations::CreateHSLShiftedImage(image, shift);
   }
 
   delegate_->SetAppImage(id, image);
 }
 
 }  // namespace extensions