Convert ui::ScaleFactor -> float in favicon/history code

chrome/browser/ui/views/create_application_shortcut_view.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/ui/views/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 19 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_family.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ skipping 436 matching lines @@
     int requested_size,
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
   if (id != pending_download_id_)
     return;
   pending_download_id_ = -1;
 
-  SkBitmap image;
+  SkBitmap bitmap;
 
   if (!bitmaps.empty()) {
-    std::vector<ui::ScaleFactor> scale_factors;
-    ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactor(
-        ui::GetScaleFactorForNativeView(
-            web_contents_->GetRenderViewHost()->GetView()->GetNativeView()));
-    scale_factors.push_back(scale_factor);
+    std::vector<float> scales;
+    scales.push_back(ui::GetScaleFactorForNativeView(
+        web_contents_->GetRenderViewHost()->GetView()->GetNativeView()));
     std::vector<size_t> closest_indices;
-    SelectFaviconFrameIndices(original_bitmap_sizes,
-                              scale_factors,
-                              requested_size,
-                              &closest_indices,
-                              NULL);
+    SelectFaviconFrameIndices(
+        original_bitmap_sizes, scales, requested_size, &closest_indices, NULL);
     size_t closest_index = closest_indices[0];
-    image = bitmaps[closest_index];
+    bitmap = bitmaps[closest_index];
   }
 
-  if (!image.isNull()) {
-    shortcut_info_.favicon.Add(gfx::ImageSkia::CreateFrom1xBitmap(image));
+  if (!bitmap.isNull()) {
+    shortcut_info_.favicon.Add(gfx::ImageSkia::CreateFrom1xBitmap(bitmap));
     static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
   } else {
     FetchIcon();
   }
 }
 
 CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
     Profile* profile,
     const extensions::Extension* app,
     const base::Callback<void(bool)>& close_callback)
@@ skipping 12 matching lines @@
   if (!close_callback_.is_null())
     close_callback_.Run(true);
   return CreateApplicationShortcutView::Accept();
 }
 
 bool CreateChromeApplicationShortcutView::Cancel() {
   if (!close_callback_.is_null())
     close_callback_.Run(false);
   return CreateApplicationShortcutView::Cancel();
 }