diff options
author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 19:29:50 +0000 |
---|---|---|
committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 19:29:50 +0000 |
commit | 08c31177789a989a7c0e6c1bd2143911f26160b7 (patch) | |
tree | 216babd0cb815a7531942222014d8930bba6bac9 /chrome/chrome_installer.gypi | |
parent | 340298ae4a1c27e26d9af08929e28c5504e498e2 (diff) | |
download | chromium_src-08c31177789a989a7c0e6c1bd2143911f26160b7.zip chromium_src-08c31177789a989a7c0e6c1bd2143911f26160b7.tar.gz chromium_src-08c31177789a989a7c0e6c1bd2143911f26160b7.tar.bz2 |
(re-commit) Implement installation of the Chrome App Host.
The Chrome App Host is a simple exe that delegates to a Chrome Binaries installation at user or system level. If no installation is available, it will trigger an installation.
The Chrome App Host prevents the Chrome Binaries from being uninstalled, except in the case of an upgrade to system-level.
Patchset 1 is http://codereview.chromium.org/10665002/ (reverted).
BUG=None
TEST=None
TBR=tommi
Review URL: https://chromiumcodereview.appspot.com/10805043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
-rw-r--r-- | chrome/chrome_installer.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 8d32b84..b21fd76 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -88,7 +88,6 @@ 'sources': [ 'installer/setup/compat_checks_unittest.cc', 'installer/setup/setup_constants.cc', - 'installer/util/browser_distribution_unittest.cc', 'installer/util/channel_info_unittest.cc', 'installer/util/copy_reg_key_work_item_unittest.cc', 'installer/util/copy_tree_work_item_unittest.cc', @@ -262,6 +261,7 @@ 'installer_util_strings', '../base/base.gyp:base', '../build/temp_gyp/googleurl.gyp:googleurl', + '../chrome/chrome.gyp:common_constants', '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../breakpad/breakpad.gyp:breakpad_handler', @@ -980,12 +980,12 @@ ['branding=="Chrome" and buildtype=="Official"', { 'actions': [ { - # copy_keychain_reauthorize.sh explains why this isn't in a - # 'copies' block, but briefly: this is a prebuilt signed - # binary component that relies on a correct signature to - # function properly, and a normal 'copies' block sadly makes - # a trivial modification to the file such that its signature - # is no longer valid. + # copy_keychain_reauthorize.sh explains why this isn't in a + # 'copies' block, but briefly: this is a prebuilt signed + # binary component that relies on a correct signature to + # function properly, and a normal 'copies' block sadly makes + # a trivial modification to the file such that its signature + # is no longer valid. 'action_name': 'Copy keychain_reauthorize', 'variables': { 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh', |