diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 23:38:20 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 23:38:20 +0000 |
| commit | a132bc9e32803003eadf99195a400e97db64a72e (patch) | |
| tree | 6cd5e8699592d5b212ee4b71dfbd5e6e1d1e1447 /chrome/installer/gcapi_mac | |
| parent | 871f8af23e4ce5ffba6da0b74bf174dd85263006 (diff) | |
| download | chromium_src-a132bc9e32803003eadf99195a400e97db64a72e.zip chromium_src-a132bc9e32803003eadf99195a400e97db64a72e.tar.gz chromium_src-a132bc9e32803003eadf99195a400e97db64a72e.tar.bz2 | |
gcapi mac: Only check for /Applications write permissions if chrome needs to be installed
BUG=none
Review URL: https://codereview.chromium.org/11411077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi_mac')
| -rw-r--r-- | chrome/installer/gcapi_mac/gcapi.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/installer/gcapi_mac/gcapi.mm b/chrome/installer/gcapi_mac/gcapi.mm index e2f9e6a..3d4e922 100644 --- a/chrome/installer/gcapi_mac/gcapi.mm +++ b/chrome/installer/gcapi_mac/gcapi.mm @@ -331,11 +331,15 @@ int GoogleChromeCompatibilityCheck(unsigned* reasons) { if (FindChromeTicket(kUserTicket, user, NULL)) local_reasons |= GCCC_ERROR_ALREADYPRESENT; - if (![[NSFileManager defaultManager] isWritableFileAtPath:@"/Applications"]) - local_reasons |= GCCC_ERROR_ACCESSDENIED; - if ([[NSFileManager defaultManager] fileExistsAtPath:kChromeInstallPath]) local_reasons |= GCCC_ERROR_ALREADYPRESENT; + + if ((local_reasons & GCCC_ERROR_ALREADYPRESENT) == 0) { + if (![[NSFileManager defaultManager] + isWritableFileAtPath:@"/Applications"]) + local_reasons |= GCCC_ERROR_ACCESSDENIED; + } + } if (reasons != NULL) *reasons = local_reasons; |