Added unpacking step

chrome/installer/mac/app/AppDelegate.m

 // Copyright 2016 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 "AppDelegate.h"
 
+#import "Downloader.h"
 #import "InstallerWindowController.h"
 #import "NSError+ChromeInstallerAdditions.h"
 #import "NSAlert+ChromeInstallerAdditions.h"
+#import "OmahaCommunication.h"
+#import "Unpacker.h"
 
 @interface NSAlert ()
 - (void)beginSheetModalForWindow:(NSWindow*)sheetWindow
                completionHandler:
                    (void (^__nullable)(NSModalResponse returnCode))handler;
 @end
 
-@interface AppDelegate ()<OmahaCommunicationDelegate, DownloaderDelegate> {
+@interface AppDelegate ()<OmahaCommunicationDelegate,
+                          DownloaderDelegate,
+                          UnpackDelegate> {
   InstallerWindowController* installerWindowController_;
 }
 @property(strong) NSWindow* window;
 @end
 
 @implementation AppDelegate
 @synthesize window = window_;
 
 // Sets up the main window and begins the downloading process.
 - (void)applicationDidFinishLaunching:(NSNotification*)aNotification {
@@ skipping 10 matching lines @@
 }
 
 - (void)startDownload {
   [installerWindowController_ updateStatusDescription:@"Initializing..."];
   OmahaCommunication* omahaMessenger = [[OmahaCommunication alloc] init];
   omahaMessenger.delegate = self;
 
   [omahaMessenger fetchDownloadURLs];
 }
 
-- (void)onOmahaSuccessWithURLs:(NSArray*)URLs {
+- (void)omahaCommunication:(OmahaCommunication*)messenger
+    onOmahaSuccessWithURLs:(NSArray*)URLs {
   [installerWindowController_ updateStatusDescription:@"Downloading..."];
   Downloader* download = [[Downloader alloc] init];
   download.delegate = self;
-  [download downloadChromeImageToDownloadsDirectory:[URLs firstObject]];
+  [download downloadChromeImageFrom:[URLs firstObject]];
 }
 
-- (void)onOmahaFailureWithError:(NSError*)error {
+- (void)omahaCommunication:(OmahaCommunication*)messenger
+    onOmahaFailureWithError:(NSError*)error {
   NSError* networkError =
       [NSError errorForAlerts:@"Network Error"
               withDescription:@"Could not connect to Chrome server."
                 isRecoverable:YES];
   [self displayError:networkError];
 }
 
 // Bridge method from Downloader to InstallerWindowController. Allows Downloader
 // to update the progressbar without having direct access to any UI obejcts.
-- (void)didDownloadData:(double)downloadProgressPercentage {
+- (void)downloader:(Downloader*)download
+    didDownloadData:(double)downloadProgressPercentage {
   [installerWindowController_
       updateDownloadProgress:(double)downloadProgressPercentage];
 }
 
 - (void)downloader:(Downloader*)download
-    onDownloadSuccess:(NSURL*)diskImagePath {
+    onDownloadSuccessWithDiskURL:(NSURL*)diskImagePath {
   [installerWindowController_ updateStatusDescription:@"Done."];
-  // TODO: replace the line of code below with real code someday
+
+  Unpacker* unpacker = [[Unpacker alloc]

[Elly Fong-Jones, 2016/08/16 15:26:18]

who owns the unpacker? it looks like we don't store it anywhere

[Anna Zeng, 2016/08/16 23:07:39]

Currently, nobody owns it, just the same as how we treat the other classes.
However, since the unpacker will care about privilege escalation, we'll be
making Unpacker an instance variable in AppDelegate.m. Oh, what luck! You might
see it in the next patch here.

[Sidney San Martín, 2016/08/17 22:09:06]

ellyjones@: Just curious, is the plan to use ARC for the installer?

+      initWithFinalAppPath:@"/Applications/Google Chromo.app"];
+  unpacker.delegate = self;
+
+  [unpacker mountDMGFromURL:diskImagePath];
 }
 
 - (void)downloader:(Downloader*)download
     onDownloadFailureWithError:(NSError*)error {
   NSError* downloadError =
       [NSError errorForAlerts:@"Download Failure"
               withDescription:@"Unable to download Google Chrome."
                 isRecoverable:NO];
   [self displayError:downloadError];
 }
 
+- (void)unpacker:(Unpacker*)unpacker onMountSuccess:(NSString*)mountpath {
+  [unpacker extractChrome];
+}
+
+// TODO: adjust error descriptions for the following failure methods
+- (void)unpacker:(Unpacker*)unpacker onMountFailure:(NSString*)mountpath {
+  NSError* mountError =
+      [NSError errorForAlerts:@"Install Failure"
+              withDescription:@"Unable to add Google Chrome to Applications."
+                isRecoverable:NO];
+  [self displayError:mountError];
+}
+
+- (void)unpacker:(Unpacker*)unpacker onExtractSuccess:(NSString*)appPath {
+  [unpacker unmountDMG];
+}
+
+- (void)unpacker:(Unpacker*)unpacker onExtractFailure:(NSString*)appPath {
+  NSError* extractError =
+      [NSError errorForAlerts:@"Install Failure"
+              withDescription:@"Unable to add Google Chrome to Applications."
+                isRecoverable:NO];
+  [self displayError:extractError];
+}
+
+- (void)unpacker:(Unpacker*)unpacker onUnmountSuccess:(NSError*)error {
+  // TODO: change the name of chromo to chrome
+  if (![[NSWorkspace sharedWorkspace] launchApplication:@"Google Chromo"]) {

[Sidney San Martín, 2016/08/13 12:37:18]

Pass the full path or use `launchApplicationAtURL:options:configuration:error:`,
which takes an NSURL. Otherwise, if the user has another copy of Chrome on their
computer, it might get launched instead of the one you just installed.

[Elly Fong-Jones, 2016/08/16 15:26:18]

Also, we're not called "Chromo" :)

[Anna Zeng, 2016/08/16 23:07:39]

Done.

[Anna Zeng, 2016/08/16 23:07:39]

I made a note of this, and added a TODO to make this a command-line flag.

+    NSLog(@"Chromo failed to launch");
+  }
+}
+
+- (void)unpacker:(Unpacker*)unpacker onUnmountFailure:(NSString*)appPath {
+  NSError* extractError =
+      [NSError errorForAlerts:@"Install Failure"
+              withDescription:@"Unable to add Google Chrome to Applications."
+                isRecoverable:NO];
+  [self displayError:extractError];

[Sidney San Martín, 2016/08/13 12:37:18]

Is an unmount failure fatal/worth showing the user? Chrome is installed, so
might as well launch it and exit. The image will no longer be mounted after the
next reboot and the temp folder will be cleaned up by the OS eventually, so no
worries.

[Anna Zeng, 2016/08/16 23:07:39]

This is true! I have now moved the unmount step to be something that happens
after launching Chrome.

+}
+
 // Displays an alert on the main window using the contents of the passed in
 // error.
 - (void)displayError:(NSError*)error {
   NSAlert* alertForUser = [NSAlert alertWithError:error];
 
   dispatch_sync(dispatch_get_main_queue(), ^{
     [alertForUser beginSheetModalForWindow:window_
                          completionHandler:^(NSModalResponse returnCode) {
                            if (returnCode != [alertForUser quitButton]) {
                              [self startDownload];
                            } else {
                              [NSApp terminate:nil];
                            }
                          }];
   });
 }
 
 @end