Misc. cleanup

chrome/browser/ui/webui/theme_source.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
   std::string GetMimeType(const std::string& path) const override;
   base::MessageLoop* MessageLoopForRequestPath(
       const std::string& path) const override;
   bool ShouldReplaceExistingSource() const override;
   bool ShouldServiceRequest(const net::URLRequest* request) const override;
 
  private:
   // 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_;
 
   // We grab the CSS early so we don't have to go back to the UI thread later.
   scoped_refptr<base::RefCountedMemory> css_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_THEME_SOURCE_H_