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/browser_distribution.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/browser_distribution.cc')
| -rw-r--r-- | chrome/installer/util/browser_distribution.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index d3a2ac3..aced1fb 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -15,6 +15,7 @@ #include "chrome/common/env_vars.h" #include "chrome/installer/util/chrome_frame_distribution.h" #include "chrome/installer/util/google_chrome_distribution.h" +#include "chrome/installer/util/google_chrome_sxs_distribution.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/l10n_string_util.h" @@ -33,7 +34,11 @@ BrowserDistribution* BrowserDistribution::GetDistribution(bool chrome_frame) { dist = new ChromeFrameDistribution(); } else { #if defined(GOOGLE_CHROME_BUILD) - dist = new GoogleChromeDistribution(); + if (InstallUtil::IsChromeSxSProcess()) { + dist = new GoogleChromeSxSDistribution(); + } else { + dist = new GoogleChromeDistribution(); + } #else dist = new BrowserDistribution(); #endif |