diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:24:17 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:24:17 +0000 |
| commit | 663f339a1197711e5a9b0f0f382920e529f4fb3e (patch) | |
| tree | ab66a4b7e8d014f3711b133db23376ba3848fe93 /build | |
| parent | 0e7d57fa87b02031db31444a22cba54b32405896 (diff) | |
| download | chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.zip chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.tar.gz chromium_src-663f339a1197711e5a9b0f0f382920e529f4fb3e.tar.bz2 | |
Include the Chrome Frame binary in Chrome installers. Note that it will only be registered (and thus used) if the installer is run with the --chrome-frame flag.
Remove a bunch of CF-specific code in the process.
BUG=46818
TEST=Can use the same mini_installer.exe to install either Chrome or Chrome Frame.
Review URL: http://codereview.chromium.org/2839009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index bd34a33..f6cb767 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -241,7 +241,6 @@ # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', - '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer', '../courgette/courgette.gyp:courgette_unittests', '../gfx/gfx.gyp:gfx_unittests', '../gpu/gpu.gyp:gpu_unittests', |