Fixed thread-unsafe use of gfx::Image in app shortcut creation.

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 "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/md5.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/shortcut.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/update_shortcut_worker_win.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 303 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::TaskbarUnpinShortcutLink(j->value().c_str());
       base::DeleteFile(*j, false);
     }
   }
 }
 
-void CreateIconAndSetRelaunchDetails(const base::FilePath& web_app_path,
-                                     const base::FilePath& icon_file,
-                                     const web_app::ShortcutInfo& shortcut_info,
-                                     HWND hwnd) {
+void CreateIconAndSetRelaunchDetails(
+    const base::FilePath& web_app_path,
+    const base::FilePath& icon_file,
+    scoped_ptr<web_app::ShortcutInfo> shortcut_info,
+    HWND hwnd) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
-  base::CommandLine command_line =
-      ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
-                                                   shortcut_info.extension_id,
-                                                   shortcut_info.profile_path);
+  base::CommandLine command_line = ShellIntegration::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);
+  ui::win::SetRelaunchDetailsForWindow(command_line.GetCommandLineString(),
+                                       shortcut_info->title, hwnd);
 
   if (!base::PathExists(web_app_path) && !base::CreateDirectory(web_app_path))
     return;
 
   ui::win::SetAppIconForWindow(icon_file.value(), 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,
-    const web_app::ShortcutInfo& shortcut_info) {
+    scoped_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 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);
+      web_app::internals::GetIconFilePath(web_app_path, shortcut_info->title);
   content::BrowserThread::PostBlockingPoolTask(
-      FROM_HERE,
-      base::Bind(&CreateIconAndSetRelaunchDetails,
-                 web_app_path,
-                 icon_file,
-                 shortcut_info,
-                 hwnd));
+      FROM_HERE, base::Bind(&CreateIconAndSetRelaunchDetails, web_app_path,
+                            icon_file, base::Passed(&shortcut_info), hwnd));
 }
 
 // Creates an "app shim exe" by linking or copying the generic app shim exe.
 // This is the binary that will be run when the user opens a file with this
 // application. The name and icon of the binary will be used on the Open With
 // menu. For this reason, we cannot simply launch chrome.exe. We give the app
 // shim exe the same name as the application (with no ".exe" extension), so that
 // the correct title will appear on the Open With menu. (Note: we also need a
 // separate binary per app because Windows only allows a single association with
 // each executable.)
@@ skipping 124 matching lines @@
                    nullptr, nullptr);
   }
 
   return num_successes == file_handlers_info.size();
 }
 
 }  // namespace
 
 namespace web_app {
 
-base::FilePath CreateShortcutInWebAppDir(const base::FilePath& web_app_dir,
-                                         const ShortcutInfo& shortcut_info) {
+base::FilePath CreateShortcutInWebAppDir(
+    const base::FilePath& web_app_dir,
+    scoped_ptr<ShortcutInfo> shortcut_info) {
   std::vector<base::FilePath> paths;
   paths.push_back(web_app_dir);
   std::vector<base::FilePath> out_filenames;
   base::FilePath web_app_dir_shortcut =
-      web_app_dir.Append(internals::GetSanitizedFileName(shortcut_info.title))
+      web_app_dir.Append(internals::GetSanitizedFileName(shortcut_info->title))
           .AddExtension(installer::kLnkExt);
   if (!PathExists(web_app_dir_shortcut)) {
-    CreateShortcutsInPaths(web_app_dir,
-                           shortcut_info,
-                           paths,
-                           SHORTCUT_CREATION_BY_USER,
-                           &out_filenames);
+    CreateShortcutsInPaths(web_app_dir, *shortcut_info, paths,
+                           SHORTCUT_CREATION_BY_USER, &out_filenames);
     DCHECK_EQ(out_filenames.size(), 1u);
     DCHECK_EQ(out_filenames[0].value(), web_app_dir_shortcut.value());
   } else {
     internals::CheckAndSaveIcon(
-        internals::GetIconFilePath(web_app_dir, shortcut_info.title),
-        shortcut_info.favicon, true);
+        internals::GetIconFilePath(web_app_dir, shortcut_info->title),
+        shortcut_info->favicon, true);
   }
   return web_app_dir_shortcut;
 }
 
 void UpdateRelaunchDetailsForApp(Profile* profile,
                                  const extensions::Extension* extension,
                                  HWND hwnd) {
   web_app::GetShortcutInfoForApp(
       extension,
       profile,
@@ skipping 21 matching lines @@
     // 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,
-    const ShortcutInfo& shortcut_info,
+    scoped_ptr<ShortcutInfo> shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info,
     const ShortcutLocations& creation_locations,
     ShortcutCreationReason creation_reason) {
   DCHECK(content::BrowserThread::CurrentlyOn(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::GetVersion() >= base::win::VERSION_WIN7);
 
   // 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::TaskbarPinShortcutLink(shortcut_to_pin.value().c_str()))
       return false;
   }
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableAppsFileAssociations)) {
     CreateFileAssociationsForApp(
-        shortcut_info.extension_id, shortcut_info.title,
-        shortcut_info.profile_path, file_handlers_info);
+        shortcut_info->extension_id, shortcut_info->title,
+        shortcut_info->profile_path, file_handlers_info);
   }
 
   return true;
 }
 
 void UpdatePlatformShortcuts(
     const base::FilePath& web_app_path,
     const base::string16& old_app_title,
-    const ShortcutInfo& shortcut_info,
+    scoped_ptr<ShortcutInfo> shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(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::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::TaskbarPinShortcutLink(shortcut_to_pin.value().c_str());
     }
   }
 
   // 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,
-                             const ShortcutInfo& shortcut_info) {
-  GetShortcutLocationsAndDeleteShortcuts(
-      web_app_path, shortcut_info.profile_path, shortcut_info.title, NULL,
-      NULL);
+                             scoped_ptr<ShortcutInfo> shortcut_info) {
+  GetShortcutLocationsAndDeleteShortcuts(web_app_path,
+                                         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 75 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