diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
| commit | 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 (patch) | |
| tree | af8b16dc2ba7fc8c8bb1c9fa18b907c847f3883d /chrome/installer | |
| parent | c70ef2906f891fe7d218980660e4cda465717916 (diff) | |
| download | chromium_org-424c4d7b64af9d0d8fd9624f381f469654d5e3d2.tar.gz | |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.cc | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index bbf4da9ca0..5286b3a33e 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -38,6 +38,8 @@ chrome_200_percent.pak: %(VersionDir)s\ [TOUCH] chrome_touch_100_percent.pak: %(VersionDir)s\ +chrome_touch_140_percent.pak: %(VersionDir)s\ +chrome_touch_180_percent.pak: %(VersionDir)s\ [GOOGLE_CHROME] SecondaryTile.png: %(VersionDir)s\ diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc index 4414ea2e0a..28a8057627 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -751,6 +751,15 @@ bool ShouldDeleteExtractedFiles() { // Main function. First gets a working dir, unpacks the resources and finally // executes setup.exe to do the install/upgrade. int WMain(HMODULE module) { +#if defined(COMPONENT_BUILD) + static const wchar_t kComponentBuildIncompatibleMessage[] = + L"mini_installer.exe is incompatible with the component build, please run" + L" setup.exe with the same command line instead. See" + L" http://crbug.com/127233#c17 for details."; + ::MessageBox(NULL, kComponentBuildIncompatibleMessage, NULL, MB_ICONERROR); + return 1; +#endif + // Always start with deleting potential leftovers from previous installations. // This can make the difference between success and failure. We've seen // many installations out in the field fail due to out of disk space problems |