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

chrome/browser/ui/views/create_application_shortcut_view.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_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
 
 #include <string>
 #include <vector>
 
 #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"
 #include "ui/views/window/dialog_delegate.h"
 
 class FaviconDownloadHelper;
 class GURL;
 class Profile;
 class SkBitmap;
 
@@ skipping 56 matching lines @@
 
   // UI elements on the dialog.
   // May be NULL if we are not displaying the app's info.
   views::View* app_info_;
   views::Label* create_shortcuts_label_;
   views::Checkbox* desktop_check_box_;
   views::Checkbox* menu_check_box_;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateApplicationShortcutView);
 };
 
 // Create an application shortcut pointing to a URL.
 class CreateUrlApplicationShortcutView : public CreateApplicationShortcutView {
  public:
@@ skipping 38 matching lines @@
       Profile* profile,
       const extensions::Extension* app,
       const base::Callback<void(bool)>& close_callback);
   ~CreateChromeApplicationShortcutView() override;
   bool Accept() override;
   bool Cancel() override;
 
  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_;
 
   base::WeakPtrFactory<CreateChromeApplicationShortcutView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateChromeApplicationShortcutView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_