Commit eba3e4e9 authored by zengster's avatar zengster Committed by Commit bot

Use AuthorizedInstall to move Chrome into place and set up permissions

Review-Url: https://codereview.chromium.org/2281263003
Cr-Commit-Position: refs/heads/master@{#415306}
parent ccceb975
...@@ -116,11 +116,6 @@ ...@@ -116,11 +116,6 @@
- (void)downloader:(Downloader*)download onSuccess:(NSURL*)diskImageURL { - (void)downloader:(Downloader*)download onSuccess:(NSURL*)diskImageURL {
[installerWindowController_ updateStatusDescription:@"Installing..."]; [installerWindowController_ updateStatusDescription:@"Installing..."];
[installerWindowController_ enableLaunchButton]; [installerWindowController_ enableLaunchButton];
// TODO: Add unpacking step here and pass the path to the app bundle inside
// the mounted disk image path to startInstall. Currently passing hardcoded
// path to preunpacked app bundle.
//[authorizedInstall_
// startInstall:@"$HOME/Downloads/Google Chrome.app"];
Unpacker* unpacker = [[Unpacker alloc] init]; Unpacker* unpacker = [[Unpacker alloc] init];
unpacker.delegate = self; unpacker.delegate = self;
...@@ -164,23 +159,10 @@ ...@@ -164,23 +159,10 @@
window_.styleMask &= ~NSClosableWindowMask; window_.styleMask &= ~NSClosableWindowMask;
preventTermination_ = YES; preventTermination_ = YES;
// TODO: move the below code into AuthorizedInstall NSString* chromeInApplicationsFolder =
NSString* chromeInApplicationsFolder = @"/Applications/Google Chromo.app"; [authorizedInstall_ startInstall:tempAppPath];
NSError* error = nil; NSError* error = nil;
if ([[NSFileManager defaultManager]
fileExistsAtPath:chromeInApplicationsFolder]) {
[[NSFileManager defaultManager] moveItemAtPath:chromeInApplicationsFolder
toPath:tempAppPath
error:nil];
}
if (![[NSFileManager defaultManager] moveItemAtPath:tempAppPath
toPath:chromeInApplicationsFolder
error:&error]) {
NSLog(@"%@", error);
}
// TODO: move the above code into AuthorizedInstall
[[NSWorkspace sharedWorkspace] [[NSWorkspace sharedWorkspace]
launchApplicationAtURL:[NSURL fileURLWithPath:chromeInApplicationsFolder launchApplicationAtURL:[NSURL fileURLWithPath:chromeInApplicationsFolder
isDirectory:NO] isDirectory:NO]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment