Mac: Generate App Mode Loader bundle + cleanup

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.
 
-#include "chrome/browser/web_applications/web_app_mac.h"
+#import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace web_app {
 
 WebAppShortcutCreator::WebAppShortcutCreator(
     const ShellIntegration::ShortcutInfo& shortcut_info)
     : info_(shortcut_info) {
 }
 
 WebAppShortcutCreator::~WebAppShortcutCreator() {
 }
 
-bool WebAppShortcutCreator::CreateShortcut() {
+bool WebAppShortcutCreator::CreateShortcut(NSString* chrome_bundle_id) {
   FilePath app_name = internals::GetSanitizedFileName(info_.title);
   FilePath app_file_name = app_name.ReplaceExtension("app");
   ScopedTempDir scoped_temp_dir;
   if (!scoped_temp_dir.CreateUniqueTempDir())
     return false;
   FilePath staging_path = scoped_temp_dir.path().Append(app_file_name);
 
   // Update the app's plist and icon in a temp directory. This works around
   // a Finder bug where the app's icon doesn't properly update.
   if (!file_util::CopyDirectory(GetAppLoaderPath(), staging_path, true)) {
     LOG(ERROR) << "Copying app to staging path: " << staging_path.value()
                << " failed";
     return false;
   }
 
-  if (!UpdatePlist(staging_path))
+  if (!UpdatePlist(staging_path, chrome_bundle_id))
     return false;
 
   if (!UpdateIcon(staging_path))
     return false;
 
   FilePath dst_path = GetDestinationPath(app_file_name);
   if (!file_util::CopyDirectory(staging_path, dst_path, true)) {
     LOG(ERROR) << "Copying app to dst path: " << dst_path.value() << " failed";
     return false;
   }
 
   [[NSWorkspace sharedWorkspace]
       selectFile:base::mac::FilePathToNSString(dst_path)
       inFileViewerRootedAtPath:nil];
   return true;
 }
 
 FilePath WebAppShortcutCreator::GetAppLoaderPath() const {
-  NSString* app_loader = [l10n_util::GetNSString(IDS_PRODUCT_NAME)
-      stringByAppendingString:@" App Mode Loader.app"];
   return base::mac::PathForFrameworkBundleResource(
-      base::mac::NSToCFCast(app_loader));
+      base::mac::NSToCFCast(@"app_mode_loader.app"));
 }
 
 FilePath WebAppShortcutCreator::GetDestinationPath(
     const FilePath& app_file_name) const {
   FilePath path;
   if (base::mac::GetLocalDirectory(NSApplicationDirectory, &path) &&
       file_util::PathIsWritable(path)) {
     return path;
   }
 
   if (base::mac::GetUserDirectory(NSApplicationDirectory, &path))
     return path;
 
   return FilePath();
 }
 
-bool WebAppShortcutCreator::UpdatePlist(const FilePath& app_path) const {
+bool WebAppShortcutCreator::UpdatePlist(
+        const FilePath& app_path, NSString* chrome_bundle_id) const {
+  NSString* const kCFBundleIdentifer = @"CFBundleIdentifier";

[sail, 2012/02/17 16:42:09]

you could also use kCFBundleIdentifierKey here

[jeremy, 2012/02/19 14:36:41]

Done.

+
   NSString* plist_path = base::mac::FilePathToNSString(
       app_path.Append("Contents").Append("Info.plist"));
   NSMutableDictionary* dict =
       [NSMutableDictionary dictionaryWithContentsOfFile:plist_path];
 
-  [dict setObject:base::SysUTF8ToNSString(info_.extension_id)
+  NSString* extension_id = base::SysUTF8ToNSString(info_.extension_id);
+
+  // Set the bundle signature.
+  NSString* bundle_id_template =
+    base::mac::ObjCCast<NSString>([dict objectForKey:kCFBundleIdentifer]);
+  NSString* bundle_id =
+      [bundle_id_template
+          stringByReplacingOccurrencesOfString:app_mode::kShortcutIdPlaceholder

[sail, 2012/02/17 16:42:09]

this function is becoming a bit long, could you change it to something like
this:
  [dict setObject:GetBundleIdentifier()
               forKey:kCFBundleIdentifierKey];

[jeremy, 2012/02/19 14:36:41]

Done.

+                                    withString:extension_id];
+  [dict setObject:bundle_id
+           forKey:kCFBundleIdentifer];
+
+
+  [dict setObject:extension_id
            forKey:app_mode::kCrAppModeShortcutIDKey];
   [dict setObject:base::SysUTF16ToNSString(info_.title)
            forKey:app_mode::kCrAppModeShortcutNameKey];
   [dict setObject:base::SysUTF8ToNSString(info_.url.spec())
            forKey:app_mode::kCrAppModeShortcutURLKey];
+  [dict setObject:chrome_bundle_id
+           forKey:app_mode::kBrowserBundleIDKey];
   return [dict writeToFile:plist_path atomically:YES];
 }
 
 bool WebAppShortcutCreator::UpdateIcon(const FilePath& app_path) const {
   // TODO:(sail) Need to implement this.
   return true;
 }
 
 }  // namespace
 
 namespace web_app {
 namespace internals {
 
 void CreateShortcutTask(const FilePath& web_app_path,
                         const FilePath& profile_path,
                         const ShellIntegration::ShortcutInfo& shortcut_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
   WebAppShortcutCreator shortcut_creator(shortcut_info);
-  shortcut_creator.CreateShortcut();
+  shortcut_creator.CreateShortcut([chrome::OuterAppBundle() bundleIdentifier]);

[sail, 2012/02/17 16:42:09]

bug 24842 seems to imply that NSBundle isn't thread safe

[jeremy, 2012/02/19 14:36:41]

Good catch! Thanks!

 }
 
 }  // namespace internals
 }  // namespace web_app