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

chrome/browser/web_applications/web_app.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_H_
 #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/web_application_info.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 
 class Profile;
 
 namespace content {
 class WebContents;
@@ skipping 23 matching lines @@
   // is still used to generate the app id (windows app id, not chrome app id).
   std::string extension_id;
   bool is_platform_app;
   base::string16 title;
   base::string16 description;
   base::FilePath extension_path;
   gfx::ImageFamily favicon;
   base::FilePath profile_path;
   std::string profile_name;
   std::string version_for_display;
+
+ private:
+  // ShortcutInfo must not be copied; generally it is passed around via
+  // scoped_ptrs. This is to allow passing ShortcutInfos between threads,
+  // despite ImageFamily having a non-thread-safe reference count.
+  DISALLOW_COPY_AND_ASSIGN(ShortcutInfo);
 };
 
 // This specifies a folder in the system applications menu (e.g the Start Menu
 // on Windows).
 //
 // These represent the applications menu root, the "Google Chrome" folder and
 // the "Chrome Apps" folder respectively.
 //
 // APP_MENU_LOCATION_HIDDEN specifies a shortcut that is used to register the
 // app with the OS (in order to give its windows shelf icons, and correct icons
@@ skipping 25 matching lines @@
 };
 
 // This encodes the cause of shortcut creation as the correct behavior in each
 // case is implementation specific.
 enum ShortcutCreationReason {
   SHORTCUT_CREATION_BY_USER,
   SHORTCUT_CREATION_AUTOMATED,
 };
 
 // Called by GetInfoForApp after fetching the ShortcutInfo and FileHandlersInfo.
-typedef base::Callback<void(const ShortcutInfo&,
+typedef base::Callback<void(scoped_ptr<ShortcutInfo>,
                             const extensions::FileHandlersInfo&)> InfoCallback;
 
 // Called by GetShortcutInfoForApp after fetching the ShortcutInfo.
-typedef base::Callback<void(const ShortcutInfo&)> ShortcutInfoCallback;
+typedef base::Callback<void(scoped_ptr<ShortcutInfo>)> ShortcutInfoCallback;
 
 #if defined(TOOLKIT_VIEWS)
 // Extracts shortcut info of the given WebContents.
-void GetShortcutInfoForTab(content::WebContents* web_contents,
-                           ShortcutInfo* info);
+scoped_ptr<ShortcutInfo> GetShortcutInfoForTab(
+    content::WebContents* web_contents);
 #endif
 
 // Updates web app shortcut of the WebContents. This function checks and
 // updates web app icon and shortcuts if needed. For icon, the check is based
 // on MD5 hash of icon image. For shortcuts, it checks the desktop, start menu
 // and quick launch (as well as pinned shortcut) for shortcut and only
 // updates (recreates) them if they exits.
 void UpdateShortcutForTabContents(content::WebContents* web_contents);
 
-ShortcutInfo ShortcutInfoForExtensionAndProfile(
+scoped_ptr<ShortcutInfo> ShortcutInfoForExtensionAndProfile(
     const extensions::Extension* app,
     Profile* profile);
 
 // Populates a ShortcutInfo and FileHandlersInfo for the given |extension| in
 // |profile| and passes them to |callback| after asynchronously loading all icon
 // representations.
 void GetInfoForApp(const extensions::Extension* extension,
                    Profile* profile,
                    const InfoCallback& callback);
 
@@ skipping 35 matching lines @@
 // Extracts the extension id from the app name.
 std::string GetExtensionIdFromApplicationName(const std::string& app_name);
 
 // Create shortcuts for web application based on given shortcut data.
 // |shortcut_info| contains information about the shortcuts to create, and
 // |locations| contains information about where to create them, while
 // |file_handlers_info| contains information about the file handlers to create.
 void CreateShortcutsWithInfo(
     ShortcutCreationReason reason,
     const ShortcutLocations& locations,
-    const ShortcutInfo& shortcut_info,
+    scoped_ptr<ShortcutInfo> shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info);
 
 // Currently only called by app_list_service_mac to create a shim for the
 // app launcher.
 void CreateNonAppShortcut(const ShortcutLocations& locations,
-                          const ShortcutInfo& shortcut_info);
+                          scoped_ptr<ShortcutInfo> shortcut_info);
 
 // Creates shortcuts for an app. This loads the app's icon from disk, and calls
 // CreateShortcutsWithInfo(). If you already have a ShortcutInfo with the app's
 // icon loaded, you should use CreateShortcutsWithInfo() directly.
 void CreateShortcuts(ShortcutCreationReason reason,
                      const ShortcutLocations& locations,
                      Profile* profile,
                      const extensions::Extension* app);
 
 // Delete all shortcuts that have been created for the given profile and
@@ skipping 39 matching lines @@
 #endif
 
 // Implemented for each platform, does the platform specific parts of creating
 // shortcuts. Used internally by CreateShortcuts methods.
 // |shortcut_data_path| is where to store any resources created for the
 // shortcut, and is also used as the UserDataDir for platform app shortcuts.
 // |shortcut_info| contains info about the shortcut to create, and
 // |creation_locations| contains information about where to create them.
 bool CreatePlatformShortcuts(
     const base::FilePath& shortcut_data_path,
-    const ShortcutInfo& shortcut_info,
+    scoped_ptr<ShortcutInfo> shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info,
     const ShortcutLocations& creation_locations,
     ShortcutCreationReason creation_reason);
 
 // Delete all the shortcuts we have added for this extension. This is the
 // platform specific implementation of the DeleteAllShortcuts function, and
 // is executed on the FILE thread.
 void DeletePlatformShortcuts(const base::FilePath& shortcut_data_path,
-                             const ShortcutInfo& shortcut_info);
+                             scoped_ptr<ShortcutInfo> shortcut_info);
 
 // Updates all the shortcuts we have added for this extension. This is the
 // platform specific implementation of the UpdateAllShortcuts function, and
 // is executed on the FILE thread.
 void UpdatePlatformShortcuts(
     const base::FilePath& shortcut_data_path,
     const base::string16& old_app_title,
-    const ShortcutInfo& shortcut_info,
+    scoped_ptr<ShortcutInfo> shortcut_info,
     const extensions::FileHandlersInfo& file_handlers_info);
 
 // Delete all the shortcuts for an entire profile.
 // This is executed on the FILE thread.
 void DeleteAllShortcutsForProfile(const base::FilePath& profile_path);
 
 // Sanitizes |name| and returns a version of it that is safe to use as an
 // on-disk file name .
 base::FilePath GetSanitizedFileName(const base::string16& name);
 
 }  // namespace internals
 
 }  // namespace web_app
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_H_