chromeos: Fix pixelated icons in app list and launcher (part 2)

chrome/browser/extensions/image_loading_tracker.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_EXTENSIONS_IMAGE_LOADING_TRACKER_H_
 #define CHROME_BROWSER_EXTENSIONS_IMAGE_LOADING_TRACKER_H_
 #pragma once
 
 #include <map>
+#include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "ui/base/layout.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 
 class SkBitmap;
 
 namespace extensions {
 class Extension;
 }
 
 namespace gfx {
 class Image;
@@ skipping 31 matching lines @@
     virtual void OnImageLoaded(const gfx::Image& image,
                                const std::string& extension_id,
                                int index) = 0;
 
    protected:
     virtual ~Observer();
   };
 
   // Information about a single image to load from a extension resource.
   struct ImageInfo {
-    ImageInfo(const ExtensionResource& resource, gfx::Size max_size);
+    ImageInfo(const ExtensionResource& resource,
+              const gfx::Size& max_size,
+              ui::ScaleFactor scale_factor);
     ~ImageInfo();
+
     ExtensionResource resource;
     // If the loaded image is larger than |max_size| it will be resized to those
     // dimensions.
     gfx::Size max_size;
+    // |scale_factor| is used to construct loaded gfx::ImageSkia.
+    ui::ScaleFactor scale_factor;
   };
 
   explicit ImageLoadingTracker(Observer* observer);
   virtual ~ImageLoadingTracker();
 
   // Specify image resource to load. If the loaded image is larger than
   // |max_size| it will be resized to those dimensions. IMPORTANT NOTE: this
   // function may call back your observer synchronously (ie before it returns)
   // if the image was found in the cache.
   void LoadImage(const extensions::Extension* extension,
                  const ExtensionResource& resource,
                  const gfx::Size& max_size,
                  CacheParam cache);
 
+  // Loads an extension image for given DIP size. On non-DIP enabled screen,
+  // this is the same as above LoadImage. On DIP screen, this function would try
+  // to load hi-res icons with proper scale factor.
+  void LoadDIPImage(const extensions::Extension* extension,

[pkotwicz, 2012/07/11 21:02:25]

Nit: I am not a fan of this method name, but I don't have any better
suggestions.

You should pass in the match type.

[oshima, 2012/07/11 21:09:33]

LoadImageInDIP is better

[xiyuan, 2012/07/13 18:35:46]

Changed name to LoadImageInDIP and pass in match_type as well.

+                    int preferred_dip_size,
+                    gfx::Size max_dip_size,
+                    CacheParam cache);
+
   // Same as LoadImage() above except it loads multiple images from the same
   // extension. This is used to load multiple resolutions of the same image
   // type.
   void LoadImages(const extensions::Extension* extension,
                   const std::vector<ImageInfo>& info_list,

[pkotwicz, 2012/07/11 21:02:25]

Can you please write a multires version of this method as well?

[xiyuan, 2012/07/13 18:35:46]

I take this function as a low-level function that just loads extension resource
and construct an ImageSkia using the loaded bitmap and scale_factor info in
ImageInfo. And in this sense, it supports multi-DIP, multi-resolution already.

                   CacheParam cache);
 
   // Returns the ID used for the next image that is loaded. That is, the return
   // value from this method corresponds to the int that is passed to
   // OnImageLoaded() the next time LoadImage() is invoked.
   int next_id() const { return next_id_; }
 
  private:
   // Information for pending image load operation for one or more images.
   struct PendingLoadInfo {
     PendingLoadInfo();
     ~PendingLoadInfo();
 
     const extensions::Extension* extension;
     // This is cached separate from |extension| in case the extension in
     // unloaded.
     std::string extension_id;
     CacheParam cache;
     size_t pending_count;
-    std::vector<SkBitmap> bitmaps;
+    gfx::ImageSkia images;
   };
 
   // Maps an integer identifying a load request to a PendingLoadInfo.
   typedef std::map<int, PendingLoadInfo> LoadMap;
 
   class ImageLoader;
 
   // When an image has finished loaded and been resized on the file thread, it
   // is posted back to this method on the original thread.  This method then
   // calls the observer's OnImageLoaded and deletes the ImageLoadingTracker if
   // it was the last image in the list. The |original_size| should be the size
   // of the image before any resizing was done.
   // |image| may be null if the file failed to decode.
-  void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
+  void OnImageLoaded(SkBitmap* image, const ImageInfo& image_info,
                      const gfx::Size& original_size, int id, bool should_cache);
 
   // Checks whether image is a component extension resource. Returns false
   // if a given |resource| does not have a corresponding image in bundled
   // resources. Otherwise fills |resource_id|.
   bool IsComponentExtensionResource(const extensions::Extension* extension,
                                     const ExtensionResource& resource,
                                     int& resource_id) const;
 
   // content::NotificationObserver method. If an extension is uninstalled while
@@ skipping 17 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   FRIEND_TEST_ALL_PREFIXES(ImageLoadingTrackerTest,
                            IsComponentExtensionResource);
 
   DISALLOW_COPY_AND_ASSIGN(ImageLoadingTracker);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_IMAGE_LOADING_TRACKER_H_