[mac] Create app shortcuts in a subfolder of /Applications

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 <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 62 matching lines @@
                             fromBitmapImageRep:image_rep] &&
              [icon_family setIconFamilyElement:kSmall8BitMask
                             fromBitmapImageRep:image_rep] &&
              [icon_family setIconFamilyElement:kSmall1BitMask
                             fromBitmapImageRep:image_rep];
     default:
       return false;
   }
 }
 
+base::FilePath GetWritableApplicationsDirectory() {
+  base::FilePath path;
+  if (base::mac::GetLocalDirectory(NSApplicationDirectory, &path) &&
+      file_util::PathIsWritable(path)) {
+    return path;
+  }
+  if (base::mac::GetUserDirectory(NSApplicationDirectory, &path))
+    return path;
+  return base::FilePath();
+}
+
 }  // namespace
 
 
 namespace web_app {
 
+const char kChromeAppDirName[] = "Chrome Apps.localized";
+
 WebAppShortcutCreator::WebAppShortcutCreator(
     const base::FilePath& user_data_dir,
     const ShellIntegration::ShortcutInfo& shortcut_info,
     const string16& chrome_bundle_id)
     : user_data_dir_(user_data_dir),
       info_(shortcut_info),
       chrome_bundle_id_(chrome_bundle_id) {
 }
 
 WebAppShortcutCreator::~WebAppShortcutCreator() {
@@ skipping 14 matching lines @@
                << " failed";
     return false;
   }
 
   if (!UpdatePlist(staging_path))
     return false;
 
   if (!UpdateIcon(staging_path))
     return false;
 
-  base::FilePath dst_path = GetDestinationPath(app_file_name);
+  base::FilePath dst_path = GetDestinationPath();
+  if (dst_path.empty() || !file_util::DirectoryExists(dst_path.DirName())) {
+    LOG(ERROR) << "Couldn't find an Applications directory to copy app to.";
+    return false;
+  }
+  if (!file_util::CreateDirectory(dst_path)) {
+    LOG(ERROR) << "Creating directory " << dst_path.value() << " failed.";
+    return false;
+  }
   if (!file_util::CopyDirectory(staging_path, dst_path, true)) {
     LOG(ERROR) << "Copying app to dst path: " << dst_path.value() << " failed";
     return false;
   }
 
   dst_path = dst_path.Append(app_file_name);
   base::mac::RemoveQuarantineAttribute(dst_path);
   RevealGeneratedBundleInFinder(dst_path);
 
   return true;
 }
 
 base::FilePath WebAppShortcutCreator::GetAppLoaderPath() const {
   return base::mac::PathForFrameworkBundleResource(
       base::mac::NSToCFCast(@"app_mode_loader.app"));
 }
 
-base::FilePath WebAppShortcutCreator::GetDestinationPath(
-    const base::FilePath& app_file_name) const {
-  base::FilePath path;
-  if (base::mac::GetLocalDirectory(NSApplicationDirectory, &path) &&
-      file_util::PathIsWritable(path)) {
+base::FilePath WebAppShortcutCreator::GetDestinationPath() const {
+  base::FilePath path = GetWritableApplicationsDirectory();
+  if (path.empty())
     return path;
-  }
-
-  if (base::mac::GetUserDirectory(NSApplicationDirectory, &path))
-    return path;
-
-  return base::FilePath();
+  return path.Append(kChromeAppDirName);
 }
 
 bool WebAppShortcutCreator::UpdatePlist(const base::FilePath& app_path) const {
   NSString* plist_path = base::mac::FilePathToNSString(
       app_path.Append("Contents").Append("Info.plist"));
 
   NSString* extension_id = base::SysUTF8ToNSString(info_.extension_id);
   NSString* extension_title = base::SysUTF16ToNSString(info_.title);
   NSString* extension_url = base::SysUTF8ToNSString(info_.url.spec());
   NSString* chrome_bundle_id = base::SysUTF16ToNSString(chrome_bundle_id_);
@@ skipping 138 matching lines @@
 void UpdatePlatformShortcuts(
     const base::FilePath& web_app_path,
     const ShellIntegration::ShortcutInfo& shortcut_info) {
   // TODO(benwells): Implement this when shortcuts / weblings are enabled on
   // mac.
 }
 
 }  // namespace internals
 
 }  // namespace web_app