Misc. cleanup

chrome/browser/ui/webui/theme_source.h

Index: chrome/browser/ui/webui/theme_source.h
diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h
index 6c0b4fcfbb0b9d351743f1d55dd4521acaeecbe2..8ccd5b6a6d3abed4ed3d02cc992384aa10f0cf88 100644
--- a/chrome/browser/ui/webui/theme_source.h
+++ b/chrome/browser/ui/webui/theme_source.h
@@ -40,16 +40,15 @@ class ThemeSource : public content::URLDataSource {
   // Fetch and send the theme bitmap.
   void SendThemeBitmap(const content::URLDataSource::GotDataCallback& callback,
                        int resource_id,
-                       float scale_factor);
+                       float scale);
 
   // Similar to SendThemeBitmap but treat the responded data as image; if the
-  // resource bundle does not contain the data for |scale_factor|, the resource
-  // bundle falls back to the data of a lower scale, which means smaller images
-  // will be served and webui handles the image incorrectly.
-  // See crbug.com/442384.
+  // resource bundle does not contain the data for |scale|, the resource bundle
+  // falls back to the data of a lower scale, which means smaller images will be
+  // served and webui handles the image incorrectly.  See crbug.com/442384.
   void SendThemeImage(const content::URLDataSource::GotDataCallback& callback,
                       int resource_id,
-                      float scale_factor);
+                      float scale);

[sky, 2016/08/26 16:25:46]

Why do you prefer scale over scale_factor? I believe we use scale_factor in a
number of places.

[Peter Kasting, 2016/08/26 19:14:57]

ScaleFactor is an enum, while "scale" is a float value.  The two have a
correspondence; for example,
https://cs.chromium.org/chromium/src/ui/base/resource/scale_factor.h provides
GetScaleForScaleFactor() to convert the former into the latter.

In the .cc file we use both concepts, so calling the latter "scale factor" as
well is confusing.

 
   // The original profile (never an OTR profile).
   Profile* profile_;