Fix Jumplist favicons to have high resolution in HDPI Windows displays

chrome/browser/win/jumplist_updater.h

 // Copyright 2014 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_WIN_JUMPLIST_UPDATER_H_
 #define CHROME_BROWSER_WIN_JUMPLIST_UPDATER_H_
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #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.h"
 
 // Represents a class used for creating an IShellLink object.
 // Even though an IShellLink also needs the absolute path to an application to
 // be executed, this class does not have any variables for it because current
 // users always use "chrome.exe" as the application.
 class ShellLinkItem : public base::RefCountedThreadSafe<ShellLinkItem> {
  public:
   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::Image& icon_data() const { return icon_data_; }
 
   std::wstring GetArguments() const;
   base::CommandLine* GetCommandLine();
 
   void set_title(const std::wstring& title) {
     title_ = title;
   }
 
   void set_icon(const std::wstring& path, int index) {
     icon_path_ = path;
     icon_index_ = index;
   }
 
-  void set_icon_data(const SkBitmap& data) {
-    icon_data_ = data;
-  }
+  void set_icon_data(const gfx::Image& data) { icon_data_ = data; }

[sky, 2017/02/08 03:14:54]

Keep the names consistent, so that rather than set_icon_data this should be
set_image. Same thing with the member names and the functions.

[chengx, 2017/02/08 07:42:26]

Done.

 
  private:
   friend class base::RefCountedThreadSafe<ShellLinkItem>;
   ~ShellLinkItem();
 
   // Used for storing and appending command-line arguments.
   base::CommandLine command_line_;
 
   // The string to be displayed in a JumpList.
   std::wstring title_;
 
   // The absolute path to an icon to be displayed in a JumpList.
   std::wstring icon_path_;
 
   // The icon index in the icon file. If an icon file consists of two or more
   // icons, set this value to identify the icon. If an icon file consists of
   // 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::Image icon_data_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellLinkItem);
 };
 
 typedef std::vector<scoped_refptr<ShellLinkItem> > ShellLinkItemList;
 
 
 // A utility class that hides the boilerplate for updating Windows JumpLists.
 // Note that JumpLists are available in Windows 7 and later only.
 //
@@ skipping 50 matching lines @@
   base::win::ScopedComPtr<ICustomDestinationList> destination_list_;
 
   // The current user setting for "Number of recent items to display in Jump
   // Lists" option in the "Taskbar and Start Menu Properties".
   size_t user_max_items_;
 
   DISALLOW_COPY_AND_ASSIGN(JumpListUpdater);
 };
 
 #endif  // CHROME_BROWSER_WIN_JUMPLIST_UPDATER_H_