diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:30:34 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 17:30:34 +0000 |
| commit | c235ea842be95f7882229fcb594107317560c88d (patch) | |
| tree | 8e7b070c16f3a3e3153a088234399ef3665ab15d /chrome/installer | |
| parent | 6f01e21afd7847e9bd9fb509393151c5790770e0 (diff) | |
| download | chromium_src-c235ea842be95f7882229fcb594107317560c88d.zip chromium_src-c235ea842be95f7882229fcb594107317560c88d.tar.gz chromium_src-c235ea842be95f7882229fcb594107317560c88d.tar.bz2 | |
Merge branch 'activesetup CL' into broken tree merge
Conflicts:
chrome/installer/setup/install_worker.cc
chrome/installer/setup/uninstall.cc
R=erikwright@chromium.org
TBR=tommi@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10809039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index f767409..fa46341 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -961,12 +961,12 @@ InstallStatus UninstallProduct(const InstallationState& original_state, browser_dist, chrome_exe, suffix))) { DeleteChromeRegistrationKeys(browser_dist, HKEY_LOCAL_MACHINE, suffix, installer_state.target_path(), &ret); - - UninstallActiveSetupEntries(installer_state, product); } ProcessDelegateExecuteWorkItems(installer_state, product); + UninstallActiveSetupEntries(installer_state, product); + if (!is_chrome) { ProcessChromeFrameWorkItems(original_state, installer_state, setup_path, product); |