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

chrome/browser/ui/webui/theme_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/theme_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 44 matching lines @@
 std::string ThemeSource::GetSource() const {
   return chrome::kChromeUIThemePath;
 }
 
 void ThemeSource::StartDataRequest(
     const std::string& path,
     int render_process_id,
     int render_frame_id,
     const content::URLDataSource::GotDataCallback& callback) {
   // Default scale factor if not specified.
-  ui::ScaleFactor scale_factor;
+  float scale_factor;

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

Nit: default initialize float

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

Done.

   std::string uncached_path;
   webui::ParsePathAndScale(GURL(GetThemePath() + path),
                            &uncached_path,
                            &scale_factor);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
     callback.Run(css_bytes_.get());
@@ skipping 54 matching lines @@
     return InstantIOContext::ShouldServiceRequest(request);
   return URLDataSource::ShouldServiceRequest(request);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ThemeSource, private:
 
 void ThemeSource::SendThemeBitmap(
     const content::URLDataSource::GotDataCallback& callback,
     int resource_id,
-    ui::ScaleFactor scale_factor) {
+    float scale_factor) {
+  ui::ScaleFactor resource_scale_factor =
+      ui::GetSupportedScaleFactor(scale_factor);
   if (ThemeProperties::IsThemeableImage(resource_id)) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
     DCHECK(tp);
 
-    scoped_refptr<base::RefCountedMemory> image_data(tp->GetRawData(
-        resource_id, scale_factor));
+    scoped_refptr<base::RefCountedMemory> image_data(
+        tp->GetRawData(resource_id, resource_scale_factor));
     callback.Run(image_data.get());
   } else {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    callback.Run(rb.LoadDataResourceBytesForScale(resource_id, scale_factor));
+    callback.Run(
+        rb.LoadDataResourceBytesForScale(resource_id, resource_scale_factor));
   }
 }