Add support for favicon scale factor in WebUI

chrome/browser/ui/webui/favicon_source.h

Index: chrome/browser/ui/webui/favicon_source.h
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h
index b501c8bbd45a83da0baedee3380b08ec28d5e15a..0d8741f39f9d529750bc344669b6d7524be71cd2 100644
--- a/chrome/browser/ui/webui/favicon_source.h
+++ b/chrome/browser/ui/webui/favicon_source.h
@@ -51,6 +51,21 @@ class FaviconSource : public ChromeURLDataManager::DataSource {
   Profile* profile_;
 
  private:
+
+  struct IconSize {
+    IconSize()
+      : pixel_size(16), scale_factor(ui::SCALE_FACTOR_NONE) {

[pkotwicz, 2012/09/17 19:32:06]

I don't think you need this constructor.

[kevers, 2012/09/17 21:13:02]

An empty constructor is required even if using insert instead of [].  Updated
formatting based on comment below.

+    }
+    IconSize(const IconSize& ref)
+      : pixel_size(ref.pixel_size), scale_factor(ref.scale_factor) {
+    }
+    IconSize(int size, ui::ScaleFactor scale)
+      :  pixel_size(size), scale_factor(scale) {

[pkotwicz, 2012/09/17 19:32:06]

As you are using multiple lines for the initializer list (ie it is not on the
same line as IconSize(...), you have to put
pixel_size and scale_factor on different lines

[kevers, 2012/09/17 21:13:02]

Explicit copy constructor removed since not needed. 

+    }
+    int pixel_size;
+    ui::ScaleFactor scale_factor;
+  };
+
   void Init(Profile* profile, IconType type);
 
   // Called when favicon data is available from the history backend.
@@ -65,7 +80,7 @@ class FaviconSource : public ChromeURLDataManager::DataSource {
 
   // Map from request ID to size requested (in pixels). TODO(estade): Get rid of
   // this map when we properly support multiple favicon sizes.
-  std::map<int, int> request_size_map_;
+  std::map<int, IconSize> request_size_map_;
 
   // Raw PNG representation of the favicon to show when the favicon
   // database doesn't have a favicon for a webpage.