Install from disk image: Create persistent Dock icon

chrome/browser/mac/install_from_dmg.mm

Index: chrome/browser/mac/install_from_dmg.mm
===================================================================
--- chrome/browser/mac/install_from_dmg.mm	(revision 90793)
+++ chrome/browser/mac/install_from_dmg.mm	(working copy)
@@ -10,6 +10,7 @@
 #include <CoreServices/CoreServices.h>
 #include <DiskArbitration/DiskArbitration.h>
 #include <IOKit/IOKitLib.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
@@ -29,6 +30,7 @@
 #include "chrome/browser/mac/scoped_authorizationref.h"
 #include "chrome/browser/mac/scoped_ioobject.h"
 #import "chrome/browser/mac/keystone_glue.h"
+#include "chrome/browser/mac/launchd.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/chrome_constants.h"
 #include "grit/chromium_strings.h"
@@ -47,6 +49,11 @@
 
 namespace {
 
+NSString* const kDockTileDataKey = @"tile-data";
+NSString* const kDockFileDataKey = @"file-data";
+NSString* const kDockCFURLStringKey = @"_CFURLString";
+NSString* const kDockCFURLStringTypeKey = @"_CFURLStringType";
+
 // Given an io_service_t (expected to be of class IOMedia), walks the ancestor
 // chain, returning the closest ancestor that implements class IOHDIXHDDrive,
 // if any. If no such ancestor is found, returns NULL. Following the "copy"
@@ -340,6 +347,270 @@
   return true;
 }
 
+// Returns an array parallel to |persistent_apps| containing only the
+// pathnames of the Dock tiles contained therein. Returns nil on failure, such
+// as when the structure of |persistent_apps| is not understood.
+NSMutableArray* PersistentAppPaths(NSArray* persistent_apps) {
+  NSMutableArray* app_paths =
+      [NSMutableArray arrayWithCapacity:[persistent_apps count]];
+
+  for (NSDictionary* app in persistent_apps) {
+    if (![app isKindOfClass:[NSDictionary class]]) {
+      LOG(ERROR) << "app not NSDictionary";
+      return nil;
+    }
+
+    NSDictionary* tile_data = [app objectForKey:kDockTileDataKey];
+    if (![tile_data isKindOfClass:[NSDictionary class]]) {
+      LOG(ERROR) << "tile_data not NSDictionary";
+      return nil;
+    }
+
+    NSDictionary* file_data = [tile_data objectForKey:kDockFileDataKey];
+    if (![file_data isKindOfClass:[NSDictionary class]]) {
+      LOG(ERROR) << "file_data not NSDictionary";
+      return nil;
+    }
+
+    NSNumber* type = [file_data objectForKey:kDockCFURLStringTypeKey];
+    if (![type isKindOfClass:[NSNumber class]]) {
+      LOG(ERROR) << "type not NSNumber";
+      return nil;
+    }
+    if ([type intValue] != 0) {
+      LOG(ERROR) << "type not 0";
+      return nil;
+    }
+
+    NSString* path = [file_data objectForKey:kDockCFURLStringKey];
+    if (![path isKindOfClass:[NSString class]]) {
+      LOG(ERROR) << "path not NSString";
+      return nil;
+    }
+
+    [app_paths addObject:path];
+  }
+
+  return app_paths;
+}
+
+// Adds an icon to the Dock pointing to |installed_path| if one is not already
+// present. |dmg_app_path| is the path to the install source. Its tile will be
+// removed if present. If any changes are made to the Dock's configuration,
+// the Dock process is restarted to reflect those changes.
+//
+// Various heruistics are used to determine where to place the new icon
+// relative to other items already existing within the Dock:
+//  - If installed_path is already in the Dock, no new tiles for this path
+//    will be added.
+//  - If dmg_app_path is present in the Dock, it will be removed. If
+//    installed_path is not already present, the new tile referencing
+//    installed_path will be placed where the dmg_app_path tile was. This
+//    keeps the tile where a user expects it if they dragged the application
+//    icon from a disk image into the Dock and then clicked on the new icon
+//    in the Dock.
+//  - The new tile will precede any application with the same name already
+//    in the Dock.
+//  - In an official build, a new tile for Google Chrome will be placed before
+//    any existing tiles for Google Chrome Canary, and a new tile for Google
+//    Chrome Canary will be placed after any existing tiles for Google Chrome.
+//  - The new tile will be placed immediately after the last tile for another
+//    browser application already in the Dock.
+//  - The new tile will be placed last in the Dock.
+// For the purposes of these comparisons, applications are identified by the
+// last component in their path. For example, any application named Safari.app
+// will be treated as a browser.
+//
+// The changes made to the Dock's configuration are the minimal changes
+// necessary to cause the desired behavior. Although it's possible to set
+// additional properties on the dock tile added to the Dock's plist, this
+// is not done. Upon relaunch, Dock.app will determine the correct values for
+// the properties it requires and add them to its configuration.
+void AddDockIcon(NSString* installed_path, NSString* dmg_app_path) {
+  NSString* dock_domain = @"com.apple.dock";
+  NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults];
+
+  NSDictionary* dock_plist_const =
+      [user_defaults persistentDomainForName:dock_domain];
+  if (![dock_plist_const isKindOfClass:[NSDictionary class]]) {
+    LOG(ERROR) << "dock_plist_const not NSDictionary";
+    return;
+  }
+  NSMutableDictionary* dock_plist =
+      [NSMutableDictionary dictionaryWithDictionary:dock_plist_const];
+
+  NSString* persistent_apps_key = @"persistent-apps";
+  NSArray* persistent_apps_const =
+      [dock_plist objectForKey:persistent_apps_key];
+  if (![persistent_apps_const isKindOfClass:[NSArray class]]) {
+    LOG(ERROR) << "persistent_apps_const not NSArray";
+    return;
+  }
+  NSMutableArray* persistent_apps =
+      [NSMutableArray arrayWithArray:persistent_apps_const];
+
+  NSMutableArray* persistent_app_paths = PersistentAppPaths(persistent_apps);
+  if (!persistent_app_paths) {
+    return;
+  }
+
+  int count = static_cast<int>([persistent_app_paths count]);

[Mark Mentovai, 2011/06/29 19:29:29]

I only had “count” in a separate variable to eliminate some casts in the for
loops. Since I’ve changed the types around a little bit, this is no longer
necessary, so I got rid of it. I didn’t like it anyway. It seemed kind of
fragile to track the count separately. Ah, ah, ah.

+  if (count < 0) {
+    LOG(ERROR) << "Too many items in the Dock";

[Robert Sesek, 2011/06/29 18:26:42]

srsly?

[Mark Mentovai, 2011/06/29 19:29:29]

rsesek wrote:
Only because I was being defensive about casting away signedness. I had used a
signed int so that I could use -1 as my special “didn’t find it” sentinel. I
changed strategy, switching to just using NSUInteger everywhere, with a special
kNotFound constant and == comparisons instead of < 0 comparisons.

+    return;
+  }
+
+  NSString* installed_path_dock = [installed_path stringByAppendingString:@"/"];

[Robert Sesek, 2011/06/29 18:26:42]

I think I understand why this is necessary, but please comment.

+  NSString* dmg_app_path_dock = [dmg_app_path stringByAppendingString:@"/"];
+
+  int already_installed_app_index = -1;
+  int app_index = -1;
+  for (int index = 0; index < count; ++index) {

[Robert Sesek, 2011/06/29 18:26:42]

Pinkerton in the past has told me to use fast enumeration and keep a counter
instead of doing this. Take that as you will.

[Mark Mentovai, 2011/06/29 19:29:29]

rsesek wrote:
I like fast enumeration and used it in PersistentAppPaths, but I’m going to veto
this suggestion. I think it’s more fragile to have to track two things
separately than to track one things and base the second strictly on the first.
What if someone adds a “continue” in the future?

It’s not like this is really performance-critical code.

+    NSString* app_path = [persistent_app_paths objectAtIndex:index];
+    if ([app_path isEqualToString:installed_path_dock]) {
+      // If the Dock already contains a reference to the newly-installed

[Robert Sesek, 2011/06/29 18:26:42]

nit: don't hyphenate compound adjectives if the left component ends in 'ly';
here and other uses of newly-installed

[you've corrected my use of 'we' so many times I don't feel guilty :D]

[Mark Mentovai, 2011/06/29 19:29:29]

rsesek wrote:
:)

+      // application, don't add another one.
+      already_installed_app_index = index;
+    } else if ([app_path isEqualToString:dmg_app_path_dock]) {
+      // If the Dock contains a reference to the application on the disk
+      // image, replace it with a reference to the newly-installed
+      // application. However, if the Dock contains a reference to both the
+      // application on the disk image and the newly-installed application,
+      // just remove the one referencing the disk image.
+      app_index = index;
+    }
+  }
+
+  bool made_change = false;
+
+  if (app_index >= 0) {
+    // Remove the Dock's reference to the application on the disk image.
+    [persistent_apps removeObjectAtIndex:app_index];
+    [persistent_app_paths removeObjectAtIndex:app_index];
+    --count;
+    made_change = true;
+  }
+
+  if (already_installed_app_index < 0) {
+    // The Dock doesn't yet have a reference to the icon at the
+    // newly-installed path. Figure out where to put the new icon.
+    NSString* app_name = [installed_path lastPathComponent];
+
+    if (app_index < 0) {

[Robert Sesek, 2011/06/29 18:26:42]

This case is confusing me; shouldn't app_index be set via line 480?

[Mark Mentovai, 2011/06/29 19:29:29]

rsesek wrote:
480 is only effective if the Dock already has a reference to the application on
the disk image. 480 covers the case where the user drags the icon into the Dock
from the dmg volume window in the Finder and then clicked it. I don’t want to
leave any icons pointing to the disk image around.

Normal users don’t do silly things like that. Think like a new user for a
second.

I’ve expanded the comment at 480 to explain this better.

+      // If an application with this name is already in the Dock, put the new
+      // one right before it.
+      for (int index = 0; index < count; ++index) {
+        NSString* dock_app_name =
+            [[persistent_app_paths objectAtIndex:index] lastPathComponent];
+        if ([dock_app_name isEqualToString:app_name]) {
+          app_index = index;
+          break;
+        }
+      }
+    }
+
+#if defined(GOOGLE_CHROME_BUILD)
+    if (app_index < 0) {
+      // If this is an officially-branded Chrome (including Canary) and an
+      // application matching the "other" flavor is already in the Dock, put
+      // them next to each other. Google Chrome will precede Google Chrome
+      // Canary in the Dock.
+      NSString* chrome_name = @"Google Chrome.app";
+      NSString* canary_name = @"Google Chrome Canary.app";
+      for (int index = 0; index < count; ++index) {

[Robert Sesek, 2011/06/29 18:26:42]

Same comment about fast enum.

+        NSString* dock_app_name =
+            [[persistent_app_paths objectAtIndex:index] lastPathComponent];
+        if ([dock_app_name isEqualToString:canary_name] &&
+            [app_name isEqualToString:chrome_name]) {
+          app_index = index;
+
+          // Break: put Google Chrome.app before the first Google Chrome
+          // Canary.app.
+          break;
+        } else if ([dock_app_name isEqualToString:chrome_name] &&
+                   [app_name isEqualToString:canary_name]) {
+          app_index = index + 1;
+
+          // No break: put Google Chrome Canary.app after the last Google
+          // Chrome.app.
+        }
+      }
+    }
+#endif  // GOOGLE_CHROME_BUILD
+
+    if (app_index < 0) {
+      // Put the new application after the last browser application already
+      // present in the Dock.
+      NSArray* other_browser_app_names =
+          [NSArray arrayWithObjects:
+#if defined(GOOGLE_CHROME_BUILD)
+                                    @"Chromium.app",  // Unbranded Google Chrome
+#else
+                                    @"Google Chrome.app",
+                                    @"Google Chrome Canary.app",
+#endif
+                                    @"Safari.app",
+                                    @"Firefox.app",
+                                    @"Camino.app",
+                                    @"Opera.app",
+                                    @"OmniWeb.app",
+                                    @"WebKit.app",    // Safari nightly
+                                    @"Aurora.app",    // Firefox dev
+                                    @"Nightly.app",   // Firefox nightly
+                                    nil];
+      for (int index = 0; index < count; ++index) {
+        NSString* dock_app_name =
+            [[persistent_app_paths objectAtIndex:index] lastPathComponent];
+        if ([other_browser_app_names containsObject:dock_app_name]) {
+          app_index = index + 1;
+        }
+      }
+    }
+
+    if (app_index < 0) {
+      // Put the new application last in the Dock.
+      app_index = count;
+    }
+
+    // Set up the new Dock tile.
+    NSDictionary* new_tile_file_data =
+        [NSDictionary dictionaryWithObjectsAndKeys:
+            installed_path_dock, kDockCFURLStringKey,
+            [NSNumber numberWithInt:0], kDockCFURLStringTypeKey,
+            nil];
+    NSDictionary* new_tile_data =
+        [NSDictionary dictionaryWithObject:new_tile_file_data
+                                    forKey:kDockFileDataKey];
+    NSDictionary* new_tile =
+        [NSDictionary dictionaryWithObject:new_tile_data
+                                    forKey:kDockTileDataKey];
+
+    // Add the new tile to the Dock.
+    [persistent_apps insertObject:new_tile atIndex:app_index];
+    [persistent_app_paths insertObject:installed_path_dock atIndex:app_index];
+    ++count;
+    made_change = true;
+  }
+
+  if (!made_change) {
+    // If no changes were made, there's no point in rewriting the Dock's
+    // plist or restarting the Dock.
+    return;
+  }
+
+  // Rewrite the plist.
+  [dock_plist setObject:persistent_apps forKey:persistent_apps_key];
+  [user_defaults setPersistentDomain:dock_plist forName:dock_domain];
+
+  // Restart the Dock. Doing this via launchd using the proper job label is
+  // the safest way to handle the restart. Unlike "killall Dock", looking this
+  // up via launchd guarantees that only the right process will be targeted.
+  // Sending a SIGHUP to the Dock seems to be a more reliable way to get the
+  // replacement Dock process to read the newly-written plist than using the
+  // equivalent of "launchctl stop" (even if followed by "launchctl start.")
+  launchd::SignalJob("com.apple.Dock.agent", SIGHUP);
+}
+
 // Launches the application at installed_path. The helper application
 // contained within install_path will be used for the relauncher process. This
 // keeps Launch Services from ever having to see or think about the helper
@@ -448,12 +719,18 @@
   if (!InstallFromDiskImage(authorization.release(),
                             installer_path,
                             source_path,
-                            target_path) ||
-      !LaunchInstalledApp(target_path, dmg_bsd_device_name)) {
+                            target_path)) {
     ShowErrorDialog();
     return false;
   }
 
+  AddDockIcon(target_path, source_path);
+
+  if (!LaunchInstalledApp(target_path, dmg_bsd_device_name)) {
+    ShowErrorDialog();
+    return false;
+  }
+
   return true;
 }