Fix Jumplist favicons to have high resolution in HDPI Windows displays

chrome/browser/win/jumplist_updater.h

Index: chrome/browser/win/jumplist_updater.h
diff --git a/chrome/browser/win/jumplist_updater.h b/chrome/browser/win/jumplist_updater.h
index 6d49f15df0462bc5e318dea9a6279655a93f6502..61b2f27023779053a936efd4d24768a9eb8c1b28 100644
--- a/chrome/browser/win/jumplist_updater.h
+++ b/chrome/browser/win/jumplist_updater.h
@@ -16,7 +16,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/win/scoped_comptr.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 // Represents a class used for creating an IShellLink object.
 // Even though an IShellLink also needs the absolute path to an application to
@@ -29,7 +29,7 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
   const std::wstring& title() const { return title_; }
   const std::wstring& icon_path() const { return icon_path_; }
   int icon_index() const { return icon_index_; }
-  const SkBitmap& icon_data() const { return icon_data_; }
+  const gfx::ImageSkia& icon_image() const { return icon_image_; }
 
   std::wstring GetArguments() const;
   base::CommandLine* GetCommandLine();
@@ -43,8 +43,8 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
     icon_index_ = index;
   }
 
-  void set_icon_data(const SkBitmap& data) {
-    icon_data_ = data;
+  void set_image(std::unique_ptr<gfx::ImageSkia> image) {

[sky, 2017/02/08 16:56:09]

Can you make the getter/getter and member consistent? If you want icon_image_,
then have this be set_icon_image. image(), set_image() and image_ is equally
fine.

Also, why the unique_ptr? ImageSkia supports copy semantics.

[chengx, 2017/02/08 19:24:17]

Function name updated. Yea, unique_ptr is not needed here. Sorry about that. 

+    icon_image_ = *image;
   }
 
  private:
@@ -65,10 +65,10 @@ class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
   // one icon, this value is 0.
   int icon_index_;
 
-  // Icon bitmap. Used by the browser JumpList.
+  // Icon image. Used by the browser JumpList.
   // Note that an icon path must be supplied to IShellLink, so users of this
   // class must save icon data to disk.
-  SkBitmap icon_data_;
+  gfx::ImageSkia icon_image_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellLinkItem);
 };