diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 21:15:07 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 21:15:07 +0000 |
commit | abf953b2d97497807592e49d4b0997f3c6acf10e (patch) | |
tree | 12dc38465d6f8eb8e0c187be576a3746192046f0 /chrome/installer/mini_installer/chrome_appid.cc | |
parent | 1a3c3cb74aa206b355a68f12370160b2b2ce7b88 (diff) | |
download | chromium_src-abf953b2d97497807592e49d4b0997f3c6acf10e.zip chromium_src-abf953b2d97497807592e49d4b0997f3c6acf10e.tar.gz chromium_src-abf953b2d97497807592e49d4b0997f3c6acf10e.tar.bz2 |
Revert 69428 - Add support for --multi-install to mini_installer, fixed a memory leak, fixed use of Win32 registry API, and refactored SetFullInstallerFlag so that it can be exercised in unit tests (tests to follow).
When --multi-install is not on command-line, "-full" is still added to the appropriate product "ap" value in official builds. When --multi-install is present, "-full" is added to the multi installer's "ap" value unless a product is being migrated from single-install to multi-install, in which case it is put on the product's "ap" value as before.
BUG=61609
TEST=Manual for now: run mini_installer.exe in various configurations, inspecting "ap" values as you go.
Review URL: http://codereview.chromium.org/5875003
TBR=grt@chromium.org
This broke the Win Builder (dbg) (Shared) bot but no-one noticed.
Review URL: http://codereview.chromium.org/5890004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer/chrome_appid.cc')
-rw-r--r-- | chrome/installer/mini_installer/chrome_appid.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/installer/mini_installer/chrome_appid.cc b/chrome/installer/mini_installer/chrome_appid.cc index 3162523..8b3c283 100644 --- a/chrome/installer/mini_installer/chrome_appid.cc +++ b/chrome/installer/mini_installer/chrome_appid.cc @@ -8,6 +8,4 @@ namespace google_update { const wchar_t kAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; const wchar_t kSxSAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; const wchar_t kChromeFrameAppGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}"; -const wchar_t kMultiInstallAppGuid[] = - L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}"; } |