diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:16:18 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:16:18 +0000 |
| commit | 526657d45abd72067ff774c552cc4df5825fc742 (patch) | |
| tree | cb5da516b3b90c0057eaff34b51697bd1ff9ea4a /chrome/chrome_dll.gypi | |
| parent | ac68bb0756f5bcb47cd79e832ef9ec6e5cb8bda0 (diff) | |
| download | chromium_src-526657d45abd72067ff774c552cc4df5825fc742.zip chromium_src-526657d45abd72067ff774c552cc4df5825fc742.tar.gz chromium_src-526657d45abd72067ff774c552cc4df5825fc742.tar.bz2 | |
Allow authenticated installs from the disk image.
When launching from a read-only disk image, if no installed copy exists in
/Applications, and the user chooses to install from the disk image:
If it appears that there isn't permission to write to /Applications, prompt
the user to authenticate as an administrator. If authentication is
successful, copy the application as root, set its permissions, and promote
Keystone to use a system ticket.
BUG=40265
TEST=Remove the application from /Applications and test, as both an admin
user and a normal user, installation directly from the disk image. When
installation occurs after authentication, Chrome should be on a system
ticket.
Also, make sure that normal in-app Keystone promotion continues to work
as expected.
Review URL: http://codereview.chromium.org/1792013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index dd77f75..b4a3bd2 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -180,6 +180,15 @@ # only be necessary to list framework-Info.plist once, not the # three times it is listed here. 'mac_bundle_resources': [ + # This image is used to badge the lock icon in the + # authentication dialogs, such as those used for installation + # from disk image and Keystone promotion (if so enabled). It + # needs to exist as a file on disk and not just something in a + # resource bundle because that's the interface that + # Authorization Services uses. Also, Authorization Services + # can't deal with .icns files. + 'app/theme/<(theme_dir_name)/product_logo_32.png', + 'app/framework-Info.plist', 'app/nibs/About.xib', 'app/nibs/AboutIPC.xib', @@ -264,6 +273,7 @@ 'app/theme/otr_icon.pdf', 'app/theme/reload_Template.pdf', 'app/theme/stop_Template.pdf', + 'browser/cocoa/install.sh', ], 'mac_bundle_resources!': [ 'app/framework-Info.plist', @@ -455,14 +465,6 @@ ], }, 'mac_bundle_resources': [ - # This image is used to badge the lock icon in the - # promotion authentication dialog. It needs to exist as - # a file on disk and not just something in a resource - # bundle because that's the interface that Authorization - # Services uses. Also, Authorization Services can't deal - # with .icns files. - 'app/theme/<(theme_dir_name)/product_logo_32.png', - 'browser/cocoa/keystone_promote_preflight.sh', 'browser/cocoa/keystone_promote_postflight.sh', ], |