Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / shortcut_manager.cc

diff --git a/src/chrome/browser/apps/shortcut_manager.cc b/src/chrome/browser/apps/shortcut_manager.cc
index c135d6e..326722c 100644 (file)
--- a/src/chrome/browser/apps/shortcut_manager.cc
+++ b/src/chrome/browser/apps/shortcut_manager.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -38,17 +37,17 @@ namespace {
 
 // Creates a shortcut for an application in the applications menu, if there is
 // not already one present.
-void CreateShortcutsInApplicationsMenu(
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
-  ShellIntegration::ShortcutLocations creation_locations;
+void CreateShortcutsInApplicationsMenu(Profile* profile,
+                                       const Extension* app) {
+  web_app::ShortcutLocations creation_locations;
   // Create the shortcut in the Chrome Apps subdir.
   creation_locations.applications_menu_location =
-      ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
-  web_app::CreateShortcuts(shortcut_info, creation_locations,
-                           web_app::SHORTCUT_CREATION_AUTOMATED);
+      web_app::APP_MENU_LOCATION_SUBDIR_CHROMEAPPS;
+  web_app::CreateShortcuts(
+      web_app::SHORTCUT_CREATION_AUTOMATED, creation_locations, profile, app);
 }
 
-bool ShouldCreateShortcutFor(const extensions::Extension* extension) {
+bool ShouldCreateShortcutFor(const Extension* extension) {
   return extension->is_platform_app() &&
       extension->location() != extensions::Manifest::COMPONENT &&
       extension->ShouldDisplayInAppLauncher();
@@ -121,26 +120,18 @@ void AppShortcutManager::Observe(int type,
       // If the app is being updated, update any existing shortcuts but do not
       // create new ones. If it is being installed, automatically create a
       // shortcut in the applications menu (e.g., Start Menu).
-      base::Callback<void(const ShellIntegration::ShortcutInfo&)>
-          create_or_update;
       if (installed_info->is_update) {
-        base::string16 old_title =
-            base::UTF8ToUTF16(installed_info->old_name);
-        create_or_update = base::Bind(&web_app::UpdateAllShortcuts,
-                                      old_title);
+        web_app::UpdateAllShortcuts(
+            base::UTF8ToUTF16(installed_info->old_name), profile_, extension);
       } else if (ShouldCreateShortcutFor(extension)) {
-        create_or_update = base::Bind(&CreateShortcutsInApplicationsMenu);
-      }
-      if (!create_or_update.is_null()) {
-        web_app::UpdateShortcutInfoAndIconForApp(extension, profile_,
-                                                 create_or_update);
+        CreateShortcutsInApplicationsMenu(profile_, extension);
       }
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
       const Extension* extension = content::Details<const Extension>(
           details).ptr();
-      DeleteApplicationShortcuts(extension);
+      web_app::DeleteAllShortcuts(profile_, extension);
       break;
     }
     default:
@@ -188,14 +179,6 @@ void AppShortcutManager::OnceOffCreateShortcuts() {
   for (extensions::ExtensionSet::const_iterator it = apps->begin();
        it != apps->end(); ++it) {
     if (ShouldCreateShortcutFor(it->get()))
-      web_app::UpdateShortcutInfoAndIconForApp(
-          it->get(), profile_, base::Bind(&CreateShortcutsInApplicationsMenu));
+      CreateShortcutsInApplicationsMenu(profile_, it->get());
   }
 }
-
-void AppShortcutManager::DeleteApplicationShortcuts(
-    const Extension* extension) {
-  ShellIntegration::ShortcutInfo delete_info =
-      web_app::ShortcutInfoForExtensionAndProfile(extension, profile_);
-  web_app::DeleteAllShortcuts(delete_info);
-}