Move Windows Jump List boilerplate out of jumplist_win for reuse

chrome/browser/jumplist_win.cc

Index: chrome/browser/jumplist_win.cc
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 5b5da7b5d7bce88b1e7fbe89c2ed6c891e9c841e..99e522ba6aae9248a94fd483d64f311e7ae26851 100644
--- a/chrome/browser/jumplist_win.cc
+++ b/chrome/browser/jumplist_win.cc
@@ -4,14 +4,6 @@
 
 #include "chrome/browser/jumplist_win.h"
 
-#include <windows.h>
-#include <shobjidl.h>
-#include <propkey.h>
-#include <propvarutil.h>
-
-#include <string>
-#include <vector>
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -20,9 +12,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
-#include "base/win/scoped_comptr.h"
-#include "base/win/scoped_propvariant.h"
-#include "base/win/windows_version.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
@@ -42,7 +31,6 @@
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
@@ -54,175 +42,20 @@ using content::BrowserThread;
 
 namespace {
 
-// COM interfaces used in this file.
-// These interface declarations are copied from Windows SDK 7.0.
-// TODO(hbono): Bug 16903: delete them when we use Windows SDK 7.0.
-#ifndef __IObjectArray_INTERFACE_DEFINED__
-#define __IObjectArray_INTERFACE_DEFINED__
-
-MIDL_INTERFACE("92CA9DCD-5622-4bba-A805-5E9F541BD8C9")
-IObjectArray : public IUnknown {
- public:
-  virtual HRESULT STDMETHODCALLTYPE GetCount(
-      /* [out] */ __RPC__out UINT *pcObjects) = 0;
-  virtual HRESULT STDMETHODCALLTYPE GetAt(
-      /* [in] */ UINT uiIndex,
-      /* [in] */ __RPC__in REFIID riid,
-      /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
-};
-
-#endif  // __IObjectArray_INTERFACE_DEFINED__
-
-#ifndef __IObjectCollection_INTERFACE_DEFINED__
-#define __IObjectCollection_INTERFACE_DEFINED__
-
-MIDL_INTERFACE("5632b1a4-e38a-400a-928a-d4cd63230295")
-IObjectCollection : public IObjectArray {
- public:
-  virtual HRESULT STDMETHODCALLTYPE AddObject(
-      /* [in] */ __RPC__in_opt IUnknown *punk) = 0;
-  virtual HRESULT STDMETHODCALLTYPE AddFromArray(
-      /* [in] */ __RPC__in_opt IObjectArray *poaSource) = 0;
-  virtual HRESULT STDMETHODCALLTYPE RemoveObjectAt(
-      /* [in] */ UINT uiIndex) = 0;
-  virtual HRESULT STDMETHODCALLTYPE Clear(void) = 0;
-};
-
-#endif  // __IObjectCollection_INTERFACE_DEFINED__
-
-#ifndef __ICustomDestinationList_INTERFACE_DEFINED__
-#define __ICustomDestinationList_INTERFACE_DEFINED__
-
-typedef /* [v1_enum] */ enum tagKNOWNDESTCATEGORY {
-  KDC_FREQUENT = 1,
-  KDC_RECENT = (KDC_FREQUENT + 1)
-} KNOWNDESTCATEGORY;
-
-MIDL_INTERFACE("6332debf-87b5-4670-90c0-5e57b408a49e")
-ICustomDestinationList : public IUnknown {
- public:
-  virtual HRESULT STDMETHODCALLTYPE SetAppID(
-      /* [string][in] */__RPC__in_string LPCWSTR pszAppID) = 0;
-  virtual HRESULT STDMETHODCALLTYPE BeginList(
-      /* [out] */ __RPC__out UINT *pcMaxSlots,
-      /* [in] */ __RPC__in REFIID riid,
-      /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
-  virtual HRESULT STDMETHODCALLTYPE AppendCategory(
-      /* [string][in] */ __RPC__in_string LPCWSTR pszCategory,
-      /* [in] */ __RPC__in_opt IObjectArray *poa) = 0;
-  virtual HRESULT STDMETHODCALLTYPE AppendKnownCategory(
-      /* [in] */ KNOWNDESTCATEGORY category) = 0;
-  virtual HRESULT STDMETHODCALLTYPE AddUserTasks(
-      /* [in] */ __RPC__in_opt IObjectArray *poa) = 0;
-  virtual HRESULT STDMETHODCALLTYPE CommitList(void) = 0;
-  virtual HRESULT STDMETHODCALLTYPE GetRemovedDestinations(
-      /* [in] */ __RPC__in REFIID riid,
-      /* [iid_is][out] */ __RPC__deref_out_opt void **ppv) = 0;
-  virtual HRESULT STDMETHODCALLTYPE DeleteList(
-      /* [string][in] */ __RPC__in_string LPCWSTR pszAppID) = 0;
-  virtual HRESULT STDMETHODCALLTYPE AbortList(void) = 0;
-};
-
-#endif  // __ICustomDestinationList_INTERFACE_DEFINED__
-
-// Class IDs used in this file.
-// These class IDs must be defined in an anonymous namespace to avoid
-// conflicts with ones defined in "shell32.lib" of Visual Studio 2008.
-// TODO(hbono): Bug 16903: delete them when we use Windows SDK 7.0.
-const CLSID CLSID_DestinationList = {
-  0x77f10cf0, 0x3db5, 0x4966, {0xb5, 0x20, 0xb7, 0xc5, 0x4f, 0xd3, 0x5e, 0xd6}
-};
-
-const CLSID CLSID_EnumerableObjectCollection = {
-  0x2d3468c1, 0x36a7, 0x43b6, {0xac, 0x24, 0xd3, 0xf0, 0x2f, 0xd9, 0x60, 0x7a}
-};
-
-};  // namespace
-
-// END OF WINDOWS 7 SDK DEFINITIONS
-
-namespace {
+// Append the common switches to each shell link.
+void AppendCommonSwitches(ShellLinkItem* shell_link) {
+  const char* kSwitchNames[] = { switches::kUserDataDir };

[tmdiep, 2014/02/18 02:56:24]

(Copying comment from the original patch that this patch was split from)

A lot of code copies the value of this command line switch instead of using
PathService. My guess is that the --user-data-dir override is not often present
in the command line args. So we prefer not add this switch and use the default
user data dir in any new chrome.exe process if not given.

+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  shell_link->CopySwitchesFrom(command_line,
+                               kSwitchNames,
+                               arraysize(kSwitchNames));
+}
 
-// Creates an IShellLink object.
-// An IShellLink object is almost the same as an application shortcut, and it
-// requires three items: the absolute path to an application, an argument
-// string, and a title string.
-HRESULT AddShellLink(base::win::ScopedComPtr<IObjectCollection> collection,
-                     const std::wstring& application,
-                     const std::wstring& switches,
-                     scoped_refptr<ShellLinkItem> item) {
-  // Create an IShellLink object.
-  base::win::ScopedComPtr<IShellLink> link;
-  HRESULT result = link.CreateInstance(CLSID_ShellLink, NULL,
-                                       CLSCTX_INPROC_SERVER);
-  if (FAILED(result))
-    return result;
-
-  // Set the application path.
-  // We should exit this function when this call fails because it doesn't make
-  // any sense to add a shortcut that we cannot execute.
-  result = link->SetPath(application.c_str());
-  if (FAILED(result))
-    return result;
-
-  // Attach the command-line switches of this process before the given
-  // arguments and set it as the arguments of this IShellLink object.
-  // We also exit this function when this call fails because it isn't usuful to
-  // add a shortcut that cannot open the given page.
-  std::wstring arguments(switches);
-  if (!item->arguments().empty()) {
-    arguments.push_back(L' ');
-    arguments += item->arguments();
-  }
-  result = link->SetArguments(arguments.c_str());
-  if (FAILED(result))
-    return result;
-
-  // Attach the given icon path to this IShellLink object.
-  // Since an icon is an optional item for an IShellLink object, so we don't
-  // have to exit even when it fails.
-  if (!item->icon().empty())
-    link->SetIconLocation(item->icon().c_str(), item->index());
-
-  // Set the title of the IShellLink object.
-  // The IShellLink interface does not have any functions which update its
-  // title because this interface is originally for creating an application
-  // shortcut which doesn't have titles.
-  // So, we should use the IPropertyStore interface to set its title as
-  // listed in the steps below:
-  // 1. Retrieve the IPropertyStore interface from the IShellLink object;
-  // 2. Start a transaction that changes a value of the object with the
-  //    IPropertyStore interface;
-  // 3. Create a string PROPVARIANT, and;
-  // 4. Call the IPropertyStore::SetValue() function to Set the title property
-  //    of the IShellLink object.
-  // 5. Commit the transaction.
-  base::win::ScopedComPtr<IPropertyStore> property_store;
-  result = link.QueryInterface(property_store.Receive());
-  if (FAILED(result))
-    return result;
-
-  base::win::ScopedPropVariant property_title;
-  // Call InitPropVariantFromString() to initialize |property_title|. Reading
-  // <propvarutil.h>, it seems InitPropVariantFromString() is an inline function
-  // that initializes a PROPVARIANT object and calls SHStrDupW() to set a copy
-  // of its input string. It is thus safe to call it without first creating a
-  // copy here.
-  result = InitPropVariantFromString(item->title().c_str(),
-                                     property_title.Receive());
-  if (FAILED(result))
-    return result;
-
-  result = property_store->SetValue(PKEY_Title, property_title.get());
-  if (FAILED(result))
-    return result;
-
-  result = property_store->Commit();
-  if (FAILED(result))
-    return result;
-
-  // Add this IShellLink object to the given collection.
-  return collection->AddObject(link);
+// Create a ShellLinkItem preloaded with common switches.
+scoped_refptr<ShellLinkItem> CreateShellLink() {
+  scoped_refptr<ShellLinkItem> link(new ShellLinkItem);
+  AppendCommonSwitches(link.get());
+  return link;
 }
 
 // Creates a temporary icon file to be shown in JumpList.
@@ -249,174 +82,56 @@ bool CreateIconFile(const SkBitmap& bitmap,
   return true;
 }
 
-// Updates a specified category of an application JumpList.
-// This function cannot update registered categories (such as "Tasks") because
-// special steps are required for updating them.
-// So, this function can be used only for adding an unregistered category.
-// Parameters:
-// * category_id (int)
-//   A string ID which contains the category name.
-// * application (std::wstring)
-//   An application name to be used for creating JumpList items.
-//   Even though we can add command-line switches to this parameter, it is
-//   better to use the |switches| parameter below.
-// * switches (std::wstring)
-//   Command-lien switches for the application. This string is to be added
-//   before the arguments of each ShellLinkItem object. If there aren't any
-//   switches, use an empty string.
-// * data (ShellLinkItemList)
-//   A list of ShellLinkItem objects to be added under the specified category.
-HRESULT UpdateCategory(base::win::ScopedComPtr<ICustomDestinationList> list,
-                       int category_id,
-                       const std::wstring& application,
-                       const std::wstring& switches,
-                       const ShellLinkItemList& data,
-                       int max_slots) {
-  // Exit this function when the given vector does not contain any items
-  // because an ICustomDestinationList::AppendCategory() call fails in this
-  // case.
-  if (data.empty() || !max_slots)
-    return S_OK;
-
-  std::wstring category =
-      base::UTF16ToWide(l10n_util::GetStringUTF16(category_id));
-
-  // Create an EnumerableObjectCollection object.
-  // We once add the given items to this collection object and add this
-  // collection to the JumpList.
-  base::win::ScopedComPtr<IObjectCollection> collection;
-  HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
-                                             NULL, CLSCTX_INPROC_SERVER);
-  if (FAILED(result))
-    return false;
-
-  for (ShellLinkItemList::const_iterator item = data.begin();
-       item != data.end() && max_slots > 0; ++item, --max_slots) {
-    scoped_refptr<ShellLinkItem> link(*item);
-    AddShellLink(collection, application, switches, link);
-  }
-
-  // We can now add the new list to the JumpList.
-  // The ICustomDestinationList::AppendCategory() function needs the
-  // IObjectArray interface to retrieve each item in the list. So, we retrive
-  // the IObjectArray interface from the IEnumeratableObjectCollection object
-  // and use it.
-  // It seems the ICustomDestinationList::AppendCategory() function just
-  // replaces all items in the given category with the ones in the new list.
-  base::win::ScopedComPtr<IObjectArray> object_array;
-  result = collection.QueryInterface(object_array.Receive());
-  if (FAILED(result))
+// Updates the "Tasks" category of the JumpList.
+bool UpdateTaskCategory(JumpListUpdater* jumplist_updater) {
+  base::FilePath chrome_path;
+  if (!PathService::Get(base::FILE_EXE, &chrome_path))
     return false;
 
-  return list->AppendCategory(category.c_str(), object_array);
-}
-
-// Updates the "Tasks" category of the JumpList.
-// Even though this function is almost the same as UpdateCategory(), this
-// function has the following differences:
-// * The "Task" category is a registered category.
-//   We should use AddUserTasks() instead of AppendCategory().
-// * The items in the "Task" category are static.
-//   We don't have to use a list.
-HRESULT UpdateTaskCategory(base::win::ScopedComPtr<ICustomDestinationList> list,
-                           const std::wstring& chrome_path,
-                           const std::wstring& chrome_switches) {
-  // Create an EnumerableObjectCollection object to be added items of the
-  // "Task" category. (We can also use this object for the "Task" category.)
-  base::win::ScopedComPtr<IObjectCollection> collection;
-  HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
-                                             NULL, CLSCTX_INPROC_SERVER);
-  if (FAILED(result))
-    return result;
+  ShellLinkItemList items;
 
   // Create an IShellLink object which launches Chrome, and add it to the
   // collection. We use our application icon as the icon for this item.
   // We remove '&' characters from this string so we can share it with our
   // system menu.
-  scoped_refptr<ShellLinkItem> chrome(new ShellLinkItem);
+  scoped_refptr<ShellLinkItem> chrome = CreateShellLink();
   std::wstring chrome_title =
       base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_WINDOW));
   ReplaceSubstringsAfterOffset(&chrome_title, 0, L"&", L"");
   chrome->SetTitle(chrome_title);
-  chrome->SetIcon(chrome_path, 0, false);
-  AddShellLink(collection, chrome_path, chrome_switches, chrome);
+  chrome->SetIcon(chrome_path.value(), 0);
+  items.push_back(chrome);
 
   // Create an IShellLink object which launches Chrome in incognito mode, and
   // add it to the collection. We use our application icon as the icon for
   // this item.
-  scoped_refptr<ShellLinkItem> incognito(new ShellLinkItem);
-  incognito->SetArguments(
+  scoped_refptr<ShellLinkItem> incognito = CreateShellLink();
+  incognito->AppendArgument(
       base::ASCIIToWide(std::string("--") + switches::kIncognito));
   std::wstring incognito_title =
       base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_INCOGNITO_WINDOW));
   ReplaceSubstringsAfterOffset(&incognito_title, 0, L"&", L"");
   incognito->SetTitle(incognito_title);
-  incognito->SetIcon(chrome_path, 0, false);
-  AddShellLink(collection, chrome_path, chrome_switches, incognito);
-
-  // We can now add the new list to the JumpList.
-  // ICustomDestinationList::AddUserTasks() also uses the IObjectArray
-  // interface to retrieve each item in the list. So, we retrieve the
-  // IObjectArray interface from the EnumerableObjectCollection object.
-  base::win::ScopedComPtr<IObjectArray> object_array;
-  result = collection.QueryInterface(object_array.Receive());
-  if (FAILED(result))
-    return result;
-
-  return list->AddUserTasks(object_array);
+  incognito->SetIcon(chrome_path.value(), 0);
+  items.push_back(incognito);
+
+  return jumplist_updater->AddTasks(items);
 }
 
 // Updates the application JumpList.
-// This function encapsulates all OS-specific operations required for updating
-// the Chromium JumpList, such as:
-// * Creating an ICustomDestinationList instance;
-// * Updating the categories of the ICustomDestinationList instance, and;
-// * Sending it to Taskbar of Windows 7.
 bool UpdateJumpList(const wchar_t* app_id,
                     const ShellLinkItemList& most_visited_pages,
                     const ShellLinkItemList& recently_closed_pages) {
   // JumpList is implemented only on Windows 7 or later.
   // So, we should return now when this function is called on earlier versions
   // of Windows.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
+  if (!JumpListUpdater::IsEnabled())
     return true;
 
-  // Create an ICustomDestinationList object and attach it to our application.
-  base::win::ScopedComPtr<ICustomDestinationList> destination_list;
-  HRESULT result = destination_list.CreateInstance(CLSID_DestinationList, NULL,
-                                                   CLSCTX_INPROC_SERVER);
-  if (FAILED(result))
-    return false;
-
-  // Set the App ID for this JumpList.
-  destination_list->SetAppID(app_id);
-
-  // Start a transaction that updates the JumpList of this application.
-  // This implementation just replaces the all items in this JumpList, so
-  // we don't have to use the IObjectArray object returned from this call.
-  // It seems Windows 7 RC (Build 7100) automatically checks the items in this
-  // removed list and prevent us from adding the same item.
-  UINT max_slots;
-  base::win::ScopedComPtr<IObjectArray> removed;
-  result = destination_list->BeginList(&max_slots, __uuidof(*removed),
-                                       reinterpret_cast<void**>(&removed));
-  if (FAILED(result))
-    return false;
-
-  // Retrieve the absolute path to "chrome.exe".
-  base::FilePath chrome_path;
-  if (!PathService::Get(base::FILE_EXE, &chrome_path))
+  JumpListUpdater jumplist_updater(app_id);
+  if (!jumplist_updater.BeginUpdate())
     return false;
 
-  // Retrieve the command-line switches of this process.
-  CommandLine command_line(CommandLine::NO_PROGRAM);
-  base::FilePath user_data_dir = CommandLine::ForCurrentProcess()->
-      GetSwitchValuePath(switches::kUserDataDir);
-  if (!user_data_dir.empty())
-    command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
-
-  std::wstring chrome_switches = command_line.GetCommandLineString();
-
   // We allocate 60% of the given JumpList slots to "most-visited" items
   // and 40% to "recently-closed" items, respectively.
   // Nevertheless, if there are not so many items in |recently_closed_pages|,
@@ -424,8 +139,10 @@ bool UpdateJumpList(const wchar_t* app_id,
   const int kMostVisited = 60;
   const int kRecentlyClosed = 40;
   const int kTotal = kMostVisited + kRecentlyClosed;
-  size_t most_visited_items = MulDiv(max_slots, kMostVisited, kTotal);
-  size_t recently_closed_items = max_slots - most_visited_items;
+  size_t most_visited_items =
+      MulDiv(jumplist_updater.user_max_items(), kMostVisited, kTotal);
+  size_t recently_closed_items =
+      jumplist_updater.user_max_items() - most_visited_items;
   if (recently_closed_pages.size() < recently_closed_items) {
     most_visited_items += recently_closed_items - recently_closed_pages.size();
     recently_closed_items = recently_closed_pages.size();
@@ -434,28 +151,27 @@ bool UpdateJumpList(const wchar_t* app_id,
   // Update the "Most Visited" category of the JumpList.
   // This update request is applied into the JumpList when we commit this
   // transaction.
-  result = UpdateCategory(destination_list, IDS_NEW_TAB_MOST_VISITED,
-                          chrome_path.value(), chrome_switches,
-                          most_visited_pages, most_visited_items);
-  if (FAILED(result))
+  if (!jumplist_updater.AddCustomCategory(
+          base::UTF16ToWide(
+              l10n_util::GetStringUTF16(IDS_NEW_TAB_MOST_VISITED)),
+          most_visited_pages, most_visited_items)) {
     return false;
+  }
 
   // Update the "Recently Closed" category of the JumpList.
-  result = UpdateCategory(destination_list, IDS_NEW_TAB_RECENTLY_CLOSED,
-                          chrome_path.value(), chrome_switches,
-                          recently_closed_pages, recently_closed_items);
-  if (FAILED(result))
+  if (!jumplist_updater.AddCustomCategory(
+          base::UTF16ToWide(
+              l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED)),
+          recently_closed_pages, recently_closed_items)) {
     return false;
+  }
 
   // Update the "Tasks" category of the JumpList.
-  result = UpdateTaskCategory(destination_list, chrome_path.value(),
-                              chrome_switches);
-  if (FAILED(result))
+  if (!UpdateTaskCategory(&jumplist_updater))
     return false;
 
   // Commit this transaction and send the updated JumpList to Windows.
-  result = destination_list->CommitList();
-  if (FAILED(result))
+  if (!jumplist_updater.CommitUpdate())
     return false;
 
   return true;
@@ -474,7 +190,7 @@ JumpList::~JumpList() {
 
 // static
 bool JumpList::Enabled() {
-  return (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
+  return (JumpListUpdater::IsEnabled() &&
           !CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kDisableCustomJumpList));
 }
@@ -485,7 +201,7 @@ bool JumpList::AddObserver(Profile* profile) {
   // When we add this object to the observer list, we save the pointer to this
   // TabRestoreService object. This pointer is used when we remove this object
   // from the observer list.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7 || !profile)
+  if (!JumpListUpdater::IsEnabled() || !profile)
     return false;
 
   TabRestoreService* tab_restore_service =
@@ -574,10 +290,11 @@ void JumpList::OnMostVisitedURLsAvailable(
     most_visited_pages_.clear();
     for (size_t i = 0; i < data.size(); i++) {
       const history::MostVisitedURL& url = data[i];
-      scoped_refptr<ShellLinkItem> link(new ShellLinkItem);
+      scoped_refptr<ShellLinkItem> link = CreateShellLink();
       std::string url_string = url.url.spec();
-      link->SetArguments(base::UTF8ToWide(url_string));
-      link->SetTitle(!url.title.empty()? url.title : link->arguments());
+      std::wstring url_string_wide = base::UTF8ToWide(url_string);
+      link->AppendArgument(url_string_wide);
+      link->SetTitle(!url.title.empty()? url.title : url_string_wide);
       most_visited_pages_.push_back(link);
       icon_urls_.push_back(make_pair(url_string, link));
     }
@@ -641,11 +358,11 @@ bool JumpList::AddTab(const TabRestoreService::Tab* tab,
   if (list->size() >= max_items)
     return false;
 
-  scoped_refptr<ShellLinkItem> link(new ShellLinkItem);
+  scoped_refptr<ShellLinkItem> link = CreateShellLink();
   const sessions::SerializedNavigationEntry& current_navigation =
       tab->navigations.at(tab->current_navigation_index);
   std::string url = current_navigation.virtual_url().spec();
-  link->SetArguments(base::UTF8ToWide(url));
+  link->AppendArgument(base::UTF8ToWide(url));
   link->SetTitle(current_navigation.title());
   list->push_back(link);
   icon_urls_.push_back(make_pair(url, link));
@@ -757,7 +474,7 @@ void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) {
   for (ShellLinkItemList::const_iterator item = item_list.begin();
       item != item_list.end(); ++item) {
     base::FilePath icon_path;
-    if (CreateIconFile((*item)->data(), icon_dir_, &icon_path))
-      (*item)->SetIcon(icon_path.value(), 0, true);
+    if (CreateIconFile((*item)->icon_data(), icon_dir_, &icon_path))
+      (*item)->SetIcon(icon_path.value(), 0);
   }
 }