| Index: chrome/installer/mac/app/AppDelegate.mm
|
| diff --git a/chrome/installer/mac/app/AppDelegate.m b/chrome/installer/mac/app/AppDelegate.mm
|
| similarity index 92%
|
| rename from chrome/installer/mac/app/AppDelegate.m
|
| rename to chrome/installer/mac/app/AppDelegate.mm
|
| index 341fb2cda9db23110bb5b28b895225591f98bfa0..a7e8b0daad75b8c64fe6223d8e8391066d4e93c5 100644
|
| --- a/chrome/installer/mac/app/AppDelegate.m
|
| +++ b/chrome/installer/mac/app/AppDelegate.mm
|
| @@ -4,6 +4,8 @@
|
|
|
| #import "AppDelegate.h"
|
|
|
| +#include "chrome/common/chrome_switches.h"
|
| +
|
| #import "Downloader.h"
|
| #import "InstallerWindowController.h"
|
| #import "NSError+ChromeInstallerAdditions.h"
|
| @@ -136,14 +138,22 @@
|
| NSLog(@"%@", error);
|
| }
|
|
|
| - // TODO: edit the below code to feed in command line arguments
|
| + NSMutableArray* installerSettings = [[NSMutableArray alloc] init];
|
| + if ([installerWindowController_ isUserMetricsChecked])
|
| + [installerSettings
|
| + addObject:[NSString stringWithUTF8String:switches::kEnableUserMetrics]];
|
| + if ([installerWindowController_ isDefaultBrowserChecked])
|
| + [installerSettings
|
| + addObject:[NSString stringWithUTF8String:switches::kSetDefaultBrowser]];
|
|
|
| [[NSWorkspace sharedWorkspace]
|
| launchApplicationAtURL:
|
| [NSURL fileURLWithPath:@"/Applications/Google Chromo.app"
|
| isDirectory:NO]
|
| options:NSWorkspaceLaunchDefault
|
| - configuration:@{}
|
| + configuration:@{
|
| + NSWorkspaceLaunchConfigurationArguments : installerSettings
|
| + }
|
| error:&error];
|
| if (error) {
|
| NSLog(@"Chromo failed to launch: %@", error);
|
|
|