diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 17:23:09 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 17:23:09 +0000 |
| commit | 220457de7cc042c28b10807ab65663e6ca0d6dc8 (patch) | |
| tree | 4fd4efcbffddf55c1ef971a2fe30d8eb5da3887f /chrome/installer | |
| parent | 876c9ffccb2be903859d4e65c760351200c10a1c (diff) | |
| download | chromium_src-220457de7cc042c28b10807ab65663e6ca0d6dc8.zip chromium_src-220457de7cc042c28b10807ab65663e6ca0d6dc8.tar.gz chromium_src-220457de7cc042c28b10807ab65663e6ca0d6dc8.tar.bz2 | |
Add a compile time assert to ensure that Google Chrome Frame builds of the installer have successfully picked up the presence of the Chrome Frame Dll at build time.
This is to avoid project dependency regressions along the lines of http://crbug.com/25074 which cause Chrome Frame to build fine, but not be registered at install time.
BUG=http://crbug.com/25074
TEST=Compile of setup.exe must fail if CHROME_FRAME_BUILD is defined and the chrome frame dll is not present in the build directory.
Review URL: http://codereview.chromium.org/292013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/install.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index ce211fd1..1d3bd7d 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -29,6 +29,11 @@ #include "installer_util_strings.h" #include "registered_dlls.h" +#if defined(CHROME_FRAME_BUILD) +COMPILE_ASSERT(kNumDllsToRegister > 0, + Chrome_Frame_DLL_must_be_built_before_setup); +#endif + namespace { std::wstring AppendPath(const std::wstring& parent_path, |