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

chrome/browser/ui/views/create_application_shortcut_view.h

Index: chrome/browser/ui/views/create_application_shortcut_view.h
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h
index d97a9e6e35327cf55803919143aa5c11b627150f..3952bb1ebb9f6b540919e3d2d66b32ae1298d6d8 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.h
+++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 #include "ui/views/controls/button/button.h"
@@ -86,7 +87,7 @@ class CreateApplicationShortcutView : public views::DialogDelegateView,
   views::Checkbox* quick_launch_check_box_;
 
   // Target shortcut and file handler info.
-  web_app::ShortcutInfo shortcut_info_;
+  scoped_ptr<web_app::ShortcutInfo> shortcut_info_;
   extensions::FileHandlersInfo file_handlers_info_;
   // If false, the shortcut will be created in the root level of the Start Menu.
   bool create_in_chrome_apps_subdir_;
@@ -145,7 +146,7 @@ class CreateChromeApplicationShortcutView
  private:
   // Called when the app's ShortcutInfo (with icon) and FileHandlersInfo is
   // loaded.
-  void OnAppInfoLoaded(const web_app::ShortcutInfo& shortcut_info,
+  void OnAppInfoLoaded(scoped_ptr<web_app::ShortcutInfo> shortcut_info,
                        const extensions::FileHandlersInfo& file_handlers_info);
 
   base::Callback<void(bool)> close_callback_;