Reduce the use of ui::ScaleFactor in webui/favicon

chrome/browser/ui/webui/fileicon_source.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/webui/fileicon_source.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 44 matching lines @@
 IconLoader::IconSize SizeStringToIconSize(const std::string& size_string) {
   if (size_string == "small") return IconLoader::SMALL;
   if (size_string == "large") return IconLoader::LARGE;
   // We default to NORMAL if we don't recognize the size_string. Including
   // size_string=="normal".
   return IconLoader::NORMAL;
 }
 
 // Simple parser for data on the query.
 void ParseQueryParams(const std::string& query,
-                      ui::ScaleFactor* scale_factor,
+                      float* scale_factor,
                       IconLoader::IconSize* icon_size) {
   typedef std::pair<std::string, std::string> KVPair;
   std::vector<KVPair> parameters;
   if (icon_size)
     *icon_size = IconLoader::NORMAL;
   if (scale_factor)
-    *scale_factor = ui::SCALE_FACTOR_100P;
+    *scale_factor = 1.0f;
   base::SplitStringIntoKeyValuePairs(query, '=', '&', &parameters);
   for (std::vector<KVPair>::const_iterator iter = parameters.begin();
        iter != parameters.end(); ++iter) {
     if (icon_size && iter->first == kIconSize)
       *icon_size = SizeStringToIconSize(iter->second);
     else if (scale_factor && iter->first == kScaleFactor)
       webui::ParseScaleFactor(iter->second, scale_factor);
   }
 }
 
 }  // namespace
 
 FileIconSource::IconRequestDetails::IconRequestDetails() {

[pkotwicz, 2014/05/20 03:31:19]

The constructor should default initialize here

[oshima, 2014/05/20 18:23:28]

Done.

 }
 
 FileIconSource::IconRequestDetails::~IconRequestDetails() {
 }
 
 FileIconSource::FileIconSource() {}
 
 FileIconSource::~FileIconSource() {}
 
 void FileIconSource::FetchFileIcon(
     const base::FilePath& path,
-    ui::ScaleFactor scale_factor,
+    float scale_factor,
     IconLoader::IconSize icon_size,
     const content::URLDataSource::GotDataCallback& callback) {
   IconManager* im = g_browser_process->icon_manager();
   gfx::Image* icon = im->LookupIconFromFilepath(path, icon_size);
 
   if (icon) {
     scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
     gfx::PNGCodec::EncodeBGRASkBitmap(
-        icon->ToImageSkia()->GetRepresentation(
-            ui::GetImageScale(scale_factor)).sk_bitmap(),
-        false, &icon_data->data());
+        icon->ToImageSkia()
+            ->GetRepresentation(scale_factor)

[pkotwicz, 2014/05/20 03:31:19]

Nit: no new line. (Similar to how the code is structured on line 157)

[oshima, 2014/05/20 18:23:28]

Done.

+            .sk_bitmap(),
+        false,
+        &icon_data->data());
 
     callback.Run(icon_data.get());
   } else {
     // Attach the ChromeURLDataManager request ID to the history request.
     IconRequestDetails details;
     details.callback = callback;
     details.scale_factor = scale_factor;
 
     // Icon was not in cache, go fetch it slowly.
     im->LoadIcon(path,
                  icon_size,
                  base::Bind(&FileIconSource::OnFileIconDataAvailable,
                             base::Unretained(this), details),
                  &cancelable_task_tracker_);
   }
 }
 
 std::string FileIconSource::GetSource() const {
   return kFileIconPath;
 }
 
 void FileIconSource::StartDataRequest(
     const std::string& url_path,
     int render_process_id,
     int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   std::string query;
   base::FilePath file_path;
-  ui::ScaleFactor scale_factor;
   IconLoader::IconSize icon_size;
+  float scale_factor;

[pkotwicz, 2014/05/20 03:31:19]

Nit: default initialize

[oshima, 2014/05/20 18:23:28]

Done.

   GetFilePathAndQuery(url_path, &file_path, &query);
   ParseQueryParams(query, &scale_factor, &icon_size);
   FetchFileIcon(file_path, scale_factor, icon_size, callback);
 }
 
 std::string FileIconSource::GetMimeType(const std::string&) const {
   // Rely on image decoder inferring the correct type.
   return std::string();
 }
 
 void FileIconSource::OnFileIconDataAvailable(const IconRequestDetails& details,
                                              gfx::Image* icon) {
   if (icon) {
     scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
     gfx::PNGCodec::EncodeBGRASkBitmap(
         icon->ToImageSkia()->GetRepresentation(
-            ui::GetImageScale(details.scale_factor)).sk_bitmap(),
+            details.scale_factor).sk_bitmap(),
         false,
         &icon_data->data());
 
     details.callback.Run(icon_data.get());
   } else {
     // TODO(glen): send a dummy icon.
     details.callback.Run(NULL);
   }
 }