Remove packaged app Windows shortcuts when app is uninstalled.

chrome/browser/web_applications/web_app.cc

 // 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.
 
 #include "chrome/browser/web_applications/web_app.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
@@ skipping 10 matching lines @@
 namespace {
 
 #if defined(TOOLKIT_VIEWS)
 // Predicator for sorting images from largest to smallest.
 bool IconPrecedes(const WebApplicationInfo::IconInfo& left,
                   const WebApplicationInfo::IconInfo& right) {
   return left.width < right.width;
 }
 #endif
 
+void DeleteShortcutsOnFileThread(
+    const ShellIntegration::ShortcutInfo& shortcut_info) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+
+  FilePath shortcut_data_dir = web_app::GetWebAppDataDirectory(
+      shortcut_info.profile_path, shortcut_info.extension_id, GURL());
+  return web_app::internals::DeletePlatformShortcuts(
+      shortcut_data_dir, shortcut_info);
+}
+
 }  // namespace
 
 namespace web_app {
 
 // The following string is used to build the directory name for
 // shortcuts to chrome applications (the kind which are installed
 // from a CRX).  Application shortcuts to URLs use the {host}_{path}
 // for the name of this directory.  Hosts can't include an underscore.
 // By starting this string with an underscore, we ensure that there
 // are no naming conflicts.
 static const char* kCrxAppPrefix = "_crx_";
 
 namespace internals {
 
 FilePath GetSanitizedFileName(const string16& name) {
 #if defined(OS_WIN)
   string16 file_name = name;
 #else
   std::string file_name = UTF16ToUTF8(name);
 #endif
   file_util::ReplaceIllegalCharactersInPath(&file_name, '_');
   return FilePath(file_name);
 }
 
 }  // namespace internals
 
 FilePath GetWebAppDataDirectory(const FilePath& profile_path,
                                 const std::string& extension_id,
                                 const GURL& url) {
+  DCHECK(!profile_path.empty());
   FilePath app_data_dir(profile_path.Append(chrome::kWebAppDirname));
 
   if (!extension_id.empty()) {
     return app_data_dir.AppendASCII(
         GenerateApplicationNameFromExtensionId(extension_id));
   }
 
   std::string host(url.host());
   std::string scheme(url.has_scheme() ? url.scheme() : "http");
   std::string port(url.has_port() ? url.port() : "80");
@@ skipping 41 matching lines @@
   return t;
 }
 
 std::string GetExtensionIdFromApplicationName(const std::string& app_name) {
   std::string prefix(kCrxAppPrefix);
   if (app_name.substr(0, prefix.length()) != prefix)
     return std::string();
   return app_name.substr(prefix.length());
 }
 
-void CreateShortcut(
-    const FilePath& profile_path,
-    const ShellIntegration::ShortcutInfo& shortcut_info) {
+void CreateShortcuts(const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(base::IgnoreResult(&CreateShortcutOnFileThread),
-                 profile_path, shortcut_info));
+      base::Bind(base::IgnoreResult(&CreateShortcutsOnFileThread),
+                 shortcut_info));
 }
 
-void DeleteAllShortcuts(const FilePath& profile_path,
-                        const std::string& extension_id) {
+void DeleteAllShortcuts(const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(&internals::DeletePlatformShortcuts, profile_path,
-                 extension_id));
+      base::Bind(&DeleteShortcutsOnFileThread, shortcut_info));
 }
 
-bool CreateShortcutOnFileThread(
-    const FilePath& profile_path,
+bool CreateShortcutsOnFileThread(
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   FilePath shortcut_data_dir = GetWebAppDataDirectory(
-      profile_path, shortcut_info.extension_id, shortcut_info.url);
-  return internals::CreatePlatformShortcut(
-      shortcut_data_dir, profile_path, shortcut_info);
+      shortcut_info.profile_path, shortcut_info.extension_id,
+      shortcut_info.url);
+  return internals::CreatePlatformShortcuts(shortcut_data_dir, shortcut_info);
 }
 
 bool IsValidUrl(const GURL& url) {
   static const char* const kValidUrlSchemes[] = {
       chrome::kFileScheme,
       chrome::kFileSystemScheme,
       chrome::kFtpScheme,
       chrome::kHttpScheme,
       chrome::kHttpsScheme,
       chrome::kExtensionScheme,
@@ skipping 26 matching lines @@
 
 #if defined(TOOLKIT_GTK)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 }  // namespace web_app