Add support for favicon scale factor in WebUI

chrome/browser/ui/webui/favicon_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_FAVICON_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 33 matching lines @@
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
 
   virtual bool ShouldReplaceExistingSource() const OVERRIDE;
 
  protected:
   virtual ~FaviconSource();
 
   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.
   void OnFaviconDataAvailable(
       FaviconService::Handle request_handle,
       const history::FaviconBitmapResult& bitmap_result);
 
   // Sends the default favicon.
   void SendDefaultResponse(int request_id);
 
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
   // 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.
   // 16x16
   scoped_refptr<base::RefCountedMemory> default_favicon_;
   // 32x32
   scoped_refptr<base::RefCountedMemory> default_favicon_large_;
 
   // The history::IconTypes of icon that this FaviconSource handles.
   int icon_types_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_FAVICON_SOURCE_H_