diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 03:24:45 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 03:24:45 +0000 |
| commit | 1bcb9751195e00e3caa8d2ef1f4593da391154fd (patch) | |
| tree | 0005020b7566ad51ede90cbdec87af143a116efe /chrome/installer/util/util_constants.cc | |
| parent | 4b92b19e3788372083133825f53c9b35972a8d36 (diff) | |
| download | chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.zip chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.tar.gz chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.tar.bz2 | |
Add google chrome sxs distribution for installer and omaha launcher.
BUG=35574
TEST=setup.exe can install/uninstall Google Chrome as before.
setup.exe --chrome-sxs can install/uninstall Chrome to alternative path.
Both versions of Chrome can co-exist.
Review URL: http://codereview.chromium.org/596069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/util_constants.cc')
| -rw-r--r-- | chrome/installer/util/util_constants.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc index f77eed1..87aaea3 100644 --- a/chrome/installer/util/util_constants.cc +++ b/chrome/installer/util/util_constants.cc @@ -11,6 +11,9 @@ namespace switches { // Run the installer in Chrome Frame mode. const wchar_t kChromeFrame[] = L"chrome-frame"; +// Run the installer for Chrome SxS. +const wchar_t kChromeSxS[] = L"chrome-sxs"; + // Create Desktop and QuickLaunch shortcuts const wchar_t kCreateAllShortcuts[] = L"create-all-shortcuts"; @@ -110,6 +113,8 @@ const wchar_t kSystemLevelToast[] = L"system-level-toast"; } // namespace switches +const wchar_t kGoogleChromeInstallSubDir1[] = L"Google"; +const wchar_t kGoogleChromeInstallSubDir2[] = L"Chrome"; const wchar_t kInstallBinaryDir[] = L"Application"; const wchar_t kInstallUserDataDir[] = L"User Data"; const wchar_t kChromeExe[] = L"chrome.exe"; @@ -120,6 +125,7 @@ const wchar_t kChromeNaCl64Dll[] = L"chrome_nacl_win64.dll"; const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll"; const wchar_t kSetupExe[] = L"setup.exe"; const wchar_t kInstallerDir[] = L"Installer"; +const wchar_t kSxSSuffix[] = L" SxS"; const wchar_t kUninstallStringField[] = L"UninstallString"; const wchar_t kUninstallDisplayNameField[] = L"DisplayName"; |