diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 18:11:15 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 18:11:15 +0000 |
| commit | e29fe694ee7666cd066a2068e78cfa62a1ca963b (patch) | |
| tree | 6a19a1fd62dc47b92f61d9fe884ed507945d6552 /chrome/installer/setup | |
| parent | 02bbad5b516e9ab3c624d40f4c95e1dbcbb5cd91 (diff) | |
| download | chromium_src-e29fe694ee7666cd066a2068e78cfa62a1ca963b.zip chromium_src-e29fe694ee7666cd066a2068e78cfa62a1ca963b.tar.gz chromium_src-e29fe694ee7666cd066a2068e78cfa62a1ca963b.tar.bz2 | |
Fix auto-uninstall of legacy multi-install Chrome Frame.
BUG=369193
Review URL: https://codereview.chromium.org/264903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index 5b64ab6..57fe5e5 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -1353,8 +1353,10 @@ void UninstallMultiChromeFrameIfPresent(const CommandLine& cmd_line, MasterPreferences uninstall_prefs(uninstall_cmd); InstallerState uninstall_state; uninstall_state.Initialize(uninstall_cmd, uninstall_prefs, *original_state); - const Product* chrome_frame_product = uninstall_state.FindProduct( - BrowserDistribution::CHROME_FRAME); + // Post M32, uninstall_prefs and uninstall_state won't have Chrome Frame in + // them since they've lost the power to do Chrome Frame installs. + const Product* chrome_frame_product = uninstall_state.AddProductFromState( + BrowserDistribution::CHROME_FRAME, *chrome_frame_state); if (chrome_frame_product) { // No shared state should be left behind. const bool remove_all = true; |