Destroy web_app::ShortcutInfo on UI thread

chrome/browser/web_applications/web_app_win.cc

 // 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.
 
 #include "chrome/browser/web_applications/web_app_win.h"
 
 #include <shlobj.h>
 #include <stddef.h>
 
 #include <memory>
@@ skipping 318 matching lines @@
     for (std::vector<base::FilePath>::const_iterator j = shortcut_files.begin();
          j != shortcut_files.end(); ++j) {
       // Any shortcut could have been pinned, either by chrome or the user, so
       // they are all unpinned.
       base::win::UnpinShortcutFromTaskbar(*j);
       base::DeleteFile(*j, false);
     }
   }
 }
 
-void CreateIconAndSetRelaunchDetails(
-    const base::FilePath& web_app_path,
-    const base::FilePath& icon_file,
-    std::unique_ptr<web_app::ShortcutInfo> shortcut_info,
-    HWND hwnd) {
+void CreateIconAndSetRelaunchDetails(const base::FilePath& web_app_path,
+                                     const base::FilePath& icon_file,
+                                     const web_app::ShortcutInfo& shortcut_info,
+                                     HWND hwnd) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   base::CommandLine command_line =
-      shell_integration::CommandLineArgsForLauncher(
-          shortcut_info->url, shortcut_info->extension_id,
-          shortcut_info->profile_path);
+      shell_integration::CommandLineArgsForLauncher(shortcut_info.url,
+                                                    shortcut_info.extension_id,
+                                                    shortcut_info.profile_path);
 
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return;
   }
   command_line.SetProgram(chrome_exe);
   ui::win::SetRelaunchDetailsForWindow(command_line.GetCommandLineString(),
-                                       shortcut_info->title, hwnd);
+                                       shortcut_info.title, hwnd);
 
   if (!base::PathExists(web_app_path) && !base::CreateDirectory(web_app_path))
     return;
 
   ui::win::SetAppIconForWindow(icon_file, 0, hwnd);
-  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info->favicon, true);
+  web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon, true);
 }
 
 void OnShortcutInfoLoadedForSetRelaunchDetails(
     HWND hwnd,
     std::unique_ptr<web_app::ShortcutInfo> shortcut_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Set window's icon to the one we're about to create/update in the web app
   // path. The icon cache will refresh on icon creation.
   base::FilePath web_app_path = web_app::GetWebAppDataDirectory(
       shortcut_info->profile_path, shortcut_info->extension_id,
       shortcut_info->url);
   base::FilePath icon_file =
       web_app::internals::GetIconFilePath(web_app_path, shortcut_info->title);
-  content::BrowserThread::PostBlockingPoolTask(
-      FROM_HERE, base::Bind(&CreateIconAndSetRelaunchDetails, web_app_path,
-                            icon_file, base::Passed(&shortcut_info), hwnd));
+  const web_app::ShortcutInfo& shortcut_info_ref = *shortcut_info;
+  content::BrowserThread::PostBlockingPoolTaskAndReply(
+      FROM_HERE,
+      base::Bind(&CreateIconAndSetRelaunchDetails, web_app_path, icon_file,
+                 base::ConstRef(shortcut_info_ref), hwnd),
+      base::Bind(&web_app::internals::DeleteShortcutInfoOnUIThread,
+                 base::Passed(&shortcut_info), base::Closure()));
 }
 
 }  // namespace
 
 namespace web_app {
 
 base::FilePath CreateShortcutInWebAppDir(
     const base::FilePath& web_app_dir,
     std::unique_ptr<ShortcutInfo> shortcut_info) {
   std::vector<base::FilePath> paths;
@@ skipping 43 matching lines @@
   if (refresh_shell_icon_cache) {
     // Refresh shell's icon cache. This call is quite disruptive as user would
     // see explorer rebuilding the icon cache. It would be great that we find
     // a better way to achieve this.
     SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST | SHCNF_FLUSHNOWAIT, NULL,
                    NULL);
   }
   return true;
 }
 
-bool CreatePlatformShortcuts(
-    const base::FilePath& web_app_path,
-    std::unique_ptr<ShortcutInfo> shortcut_info,
-    const ShortcutLocations& creation_locations,
-    ShortcutCreationReason creation_reason) {
+bool CreatePlatformShortcuts(const base::FilePath& web_app_path,
+                             const ShortcutInfo& shortcut_info,
+                             const ShortcutLocations& creation_locations,
+                             ShortcutCreationReason creation_reason) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   // Nothing to do on Windows for hidden apps.
   if (creation_locations.applications_menu_location == APP_MENU_LOCATION_HIDDEN)
     return true;
 
   // Shortcut paths under which to create shortcuts.
   std::vector<base::FilePath> shortcut_paths =
       GetShortcutPaths(creation_locations);
 
   bool pin_to_taskbar = creation_locations.in_quick_launch_bar &&
                         base::win::CanPinShortcutToTaskbar();
 
   // Create/update the shortcut in the web app path for the "Pin To Taskbar"
   // option in Win7. We use the web app path shortcut because we will overwrite
   // it rather than appending unique numbers if the shortcut already exists.
   // This prevents pinned apps from having unique numbers in their names.
   if (pin_to_taskbar)
     shortcut_paths.push_back(web_app_path);
 
   if (shortcut_paths.empty())
     return false;
 
-  if (!CreateShortcutsInPaths(web_app_path, *shortcut_info, shortcut_paths,
+  if (!CreateShortcutsInPaths(web_app_path, shortcut_info, shortcut_paths,
                               creation_reason, NULL))
     return false;
 
   if (pin_to_taskbar) {
-    base::FilePath file_name = GetSanitizedFileName(shortcut_info->title);
+    base::FilePath file_name = GetSanitizedFileName(shortcut_info.title);
     // Use the web app path shortcut for pinning to avoid having unique numbers
     // in the application name.
     base::FilePath shortcut_to_pin = web_app_path.Append(file_name).
         AddExtension(installer::kLnkExt);
     if (!base::win::PinShortcutToTaskbar(shortcut_to_pin))
       return false;
   }
 
   return true;
 }
 
 void UpdatePlatformShortcuts(const base::FilePath& web_app_path,
                              const base::string16& old_app_title,
-                             std::unique_ptr<ShortcutInfo> shortcut_info) {
+                             const ShortcutInfo& shortcut_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   // Generates file name to use with persisted ico and shortcut file.
   base::FilePath file_name =
-      web_app::internals::GetSanitizedFileName(shortcut_info->title);
+      web_app::internals::GetSanitizedFileName(shortcut_info.title);
 
-  if (old_app_title != shortcut_info->title) {
+  if (old_app_title != shortcut_info.title) {
     // The app's title has changed. Delete all existing app shortcuts and
     // recreate them in any locations they already existed (but do not add them
     // to locations where they do not currently exist).
     bool was_pinned_to_taskbar;
     std::vector<base::FilePath> shortcut_paths;
     GetShortcutLocationsAndDeleteShortcuts(
-        web_app_path, shortcut_info->profile_path, old_app_title,
+        web_app_path, shortcut_info.profile_path, old_app_title,
         &was_pinned_to_taskbar, &shortcut_paths);
-    CreateShortcutsInPaths(web_app_path, *shortcut_info, shortcut_paths,
+    CreateShortcutsInPaths(web_app_path, shortcut_info, shortcut_paths,
                            SHORTCUT_CREATION_BY_USER, NULL);
     // If the shortcut was pinned to the taskbar,
     // GetShortcutLocationsAndDeleteShortcuts will have deleted it. In that
     // case, re-pin it.
     if (was_pinned_to_taskbar && base::win::CanPinShortcutToTaskbar()) {
-      base::FilePath file_name = GetSanitizedFileName(shortcut_info->title);
+      base::FilePath file_name = GetSanitizedFileName(shortcut_info.title);
       // Use the web app path shortcut for pinning to avoid having unique
       // numbers in the application name.
       base::FilePath shortcut_to_pin = web_app_path.Append(file_name).
           AddExtension(installer::kLnkExt);
       base::win::PinShortcutToTaskbar(shortcut_to_pin);
     }
   }
 
   // Update the icon if necessary.
-  base::FilePath icon_file =
-      GetIconFilePath(web_app_path, shortcut_info->title);
-  CheckAndSaveIcon(icon_file, shortcut_info->favicon, true);
+  base::FilePath icon_file = GetIconFilePath(web_app_path, shortcut_info.title);
+  CheckAndSaveIcon(icon_file, shortcut_info.favicon, true);
 }
 
 void DeletePlatformShortcuts(const base::FilePath& web_app_path,
-                             std::unique_ptr<ShortcutInfo> shortcut_info) {
+                             const ShortcutInfo& shortcut_info) {
   GetShortcutLocationsAndDeleteShortcuts(web_app_path,
-                                         shortcut_info->profile_path,
-                                         shortcut_info->title, NULL, NULL);
+                                         shortcut_info.profile_path,
+                                         shortcut_info.title, NULL, NULL);
 
   // If there are no more shortcuts in the Chrome Apps subdirectory, remove it.
   base::FilePath chrome_apps_dir;
   if (ShellUtil::GetShortcutPath(
           ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_APPS_DIR,
           BrowserDistribution::GetDistribution(),
           ShellUtil::CURRENT_USER,
           &chrome_apps_dir)) {
     if (base::IsDirectoryEmpty(chrome_apps_dir))
       base::DeleteFile(chrome_apps_dir, false);
@@ skipping 74 matching lines @@
 
 }  // namespace internals
 
 void UpdateShortcutForTabContents(content::WebContents* web_contents) {
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
   worker->Run();
 }
 
 }  // namespace web_app