Recreate shortcuts on app update.

chrome/browser/web_applications/web_app_mac.mm

 // 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.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
@@ skipping 210 matching lines @@
 
   if (!UpdateIcon(staging_path))
     return false;
 
   if (!file_util::CopyDirectory(staging_path, dst_path, true)) {
     LOG(ERROR) << "Copying app to dst path: " << dst_path.value() << " failed";
     return false;
   }
 
   base::mac::RemoveQuarantineAttribute(app_path);
-  RevealGeneratedBundleInFinder(app_path);
 
   return true;
 }
 
 base::FilePath WebAppShortcutCreator::GetAppLoaderPath() const {
   return base::mac::PathForFrameworkBundleResource(
       base::mac::NSToCFCast(@"app_mode_loader.app"));
 }
 
 base::FilePath WebAppShortcutCreator::GetDestinationPath() const {
@@ skipping 122 matching lines @@
   NSString* extension_id = base::SysUTF8ToNSString(info_.extension_id);
   NSString* placeholder =
       [NSString stringWithFormat:@"@%@@", app_mode::kShortcutIdPlaceholder];
   NSString* bundle_id =
       [bundle_id_template
           stringByReplacingOccurrencesOfString:placeholder
                                     withString:extension_id];
   return bundle_id;
 }
 
-void WebAppShortcutCreator::RevealGeneratedBundleInFinder(
-    const base::FilePath& generated_bundle) const {
+void WebAppShortcutCreator::RevealAppShimInFinder() const {
   [[NSWorkspace sharedWorkspace]
-                    selectFile:base::mac::FilePathToNSString(generated_bundle)
+                    selectFile:base::mac::FilePathToNSString(GetShortcutPath())
       inFileViewerRootedAtPath:nil];
 }
 
 void LaunchShimOnFileThread(
       const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   base::FilePath shim_path = web_app::GetAppInstallPath(shortcut_info);
   if (shim_path.empty())
     return;
 
@@ skipping 42 matching lines @@
 
   NSString* path_string = [base::mac::CFToNSCast(url.get()) path];
   return base::FilePath([path_string fileSystemRepresentation]);
 }
 
 bool CreatePlatformShortcuts(
     const base::FilePath& web_app_path,
     const ShellIntegration::ShortcutInfo& shortcut_info,
     const ShellIntegration::ShortcutLocations& /*creation_locations*/) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
-  string16 bundle_id = UTF8ToUTF16(base::mac::BaseBundleID());
-  WebAppShortcutCreator shortcut_creator(web_app_path, shortcut_info,
-                            bundle_id);
-  return shortcut_creator.CreateShortcut();
+  WebAppShortcutCreator shortcut_creator(
+      web_app_path, shortcut_info, UTF8ToUTF16(base::mac::BaseBundleID()));
+  bool success = shortcut_creator.CreateShortcut();
+  if (success)
+    shortcut_creator.RevealAppShimInFinder();
+
+  return success;
 }
 
 void DeletePlatformShortcuts(
     const base::FilePath& web_app_path,
-    const ShellIntegration::ShortcutInfo& info) {
+    const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
-
-  base::FilePath bundle_path = GetAppBundleByExtensionId(info.extension_id);
-  file_util::Delete(bundle_path, true);
+  WebAppShortcutCreator shortcut_creator(
+      web_app_path, shortcut_info, UTF8ToUTF16(base::mac::BaseBundleID()));
+  base::FilePath app_path = shortcut_creator.GetShortcutPath();

[tapted, 2013/06/12 08:17:52]

We should check if this is empty. (say... both Applications folders became
write-protected since it installed). otherwise...

[jackhou1, 2013/06/12 08:30:40]

Done.

+  file_util::Delete(app_path, true);
+  base::FilePath apps_folder = app_path.BaseName();

[tapted, 2013/06/12 08:17:52]

... this would become "." ...

[jackhou1, 2013/06/12 08:30:40]

Done.

+  if (file_util::IsDirectoryEmpty(apps_folder))
+    file_util::Delete(apps_folder, false);

[tapted, 2013/06/12 08:17:52]

... and this could try to delete some random folder. Maybe.

Also, do things typically check the return value of file_util::Delete? I guess
web_app_win.cc doesn't, so maybe it's fine.

[jackhou1, 2013/06/12 08:30:40]

There's not much we can do if it did not succeed.

 }
 
 void UpdatePlatformShortcuts(
     const base::FilePath& web_app_path,
-    const string16& old_app_title,
+    const string16& /*old_app_title*/,

[tapted, 2013/06/12 08:17:52]

nit: I like it better without this commented out ;). -Wshadow isn't coming to
chrome any time soon..

[jackhou1, 2013/06/12 08:30:40]

Done.

     const ShellIntegration::ShortcutInfo& shortcut_info) {
-  // TODO(benwells): Implement this when shortcuts / weblings are enabled on
-  // mac.
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  WebAppShortcutCreator shortcut_creator(
+      web_app_path, shortcut_info, UTF8ToUTF16(base::mac::BaseBundleID()));
+  file_util::Delete(shortcut_creator.GetShortcutPath(), true);

[tapted, 2013/06/12 08:17:52]

Check for empty here too -- passing empty strings to Delete sounds scary.

[jackhou1, 2013/06/12 08:30:40]

Done.

+  shortcut_creator.CreateShortcut();
 }
 
 }  // namespace internals
 
 }  // namespace web_app