Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / create_application_shortcut_view.cc

diff --git a/src/chrome/browser/ui/views/create_application_shortcut_view.cc b/src/chrome/browser/ui/views/create_application_shortcut_view.cc
index 360c908..b714aee 100644 (file)
--- a/src/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/src/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -393,10 +393,10 @@ bool CreateApplicationShortcutView::Accept() {
   creation_locations.in_quick_launch_bar = false;
 #endif
 
-  web_app::CreateShortcutsForShortcutInfo(
-      web_app::SHORTCUT_CREATION_BY_USER,
-      creation_locations,
-      shortcut_info_);
+  web_app::CreateShortcutsWithInfo(web_app::SHORTCUT_CREATION_BY_USER,
+                                   creation_locations,
+                                   shortcut_info_,
+                                   file_handlers_info_);
   return true;
 }
 
@@ -520,12 +520,12 @@ CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
 
   InitControls(DIALOG_LAYOUT_APP_SHORTCUT);
 
-  // Get shortcut information and icon; they are needed for creating the
-  // shortcut.
-  web_app::UpdateShortcutInfoAndIconForApp(
+  // Get shortcut, icon and file handler information; they are needed for
+  // creating the shortcut.
+  web_app::GetInfoForApp(
       app,
       profile,
-      base::Bind(&CreateChromeApplicationShortcutView::OnShortcutInfoLoaded,
+      base::Bind(&CreateChromeApplicationShortcutView::OnAppInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ -543,8 +543,9 @@ bool CreateChromeApplicationShortcutView::Cancel() {
   return CreateApplicationShortcutView::Cancel();
 }
 
-// Called when the app's ShortcutInfo (with icon) is loaded.
-void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
-    const web_app::ShortcutInfo& shortcut_info) {
+void CreateChromeApplicationShortcutView::OnAppInfoLoaded(
+    const web_app::ShortcutInfo& shortcut_info,
+    const extensions::FileHandlersInfo& file_handlers_info) {
   shortcut_info_ = shortcut_info;
+  file_handlers_info_ = file_handlers_info;
 }