diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 10:45:32 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 10:45:32 +0000 |
| commit | 0cba296108328045bad62e2286f5ec6a2e4fd7e8 (patch) | |
| tree | 5d60490adfbb0d68f62e51809551b6cfb6e19063 /chrome/installer/setup/uninstall.cc | |
| parent | e69786054d76d7a8cc2a15536597b2ffb248afde (diff) | |
| download | chromium_src-0cba296108328045bad62e2286f5ec6a2e4fd7e8.zip chromium_src-0cba296108328045bad62e2286f5ec6a2e4fd7e8.tar.gz chromium_src-0cba296108328045bad62e2286f5ec6a2e4fd7e8.tar.bz2 | |
Implement an AutoLaunch experiment for Chrome for certain brand codes. This is for Windows only.
BUG=95971
TEST=This requires a special branded build to test (and master_preferences set to have auto_launch_chrome: true or specify mini_installer param --auto-launch-chrome), but after installing it you should see an item under the Wrench \ Options \ Basics that lets you configure Chrome to not auto-launch. If you instead, log out and log in again, Chrome should start with an infobar saying that it was auto-launched. The infobar should stay for a max of 5 launches and then not appear again. Pressing "Cut it out!" on the infobar should turn off this feature. If you just want to test the infobar, launch chrome with --auto-launch-at-startup. Also, uninstall and make sure Chrome is not auto-launched (a Windows error about Chrome not being found should not be shown).
Review URL: http://codereview.chromium.org/8729009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/uninstall.cc')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index 6538eab..08f53b7 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -22,6 +22,7 @@ #include "chrome/installer/setup/install_worker.h" #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/setup/setup_util.h" +#include "chrome/installer/util/auto_launch_util.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/delete_after_reboot_helper.h" @@ -734,9 +735,13 @@ InstallStatus UninstallProduct(const InstallationState& original_state, // Chrome is not in use so lets uninstall Chrome by deleting various files // and registry entries. Here we will just make best effort and keep going // in case of errors. - if (is_chrome) + if (is_chrome) { ClearRlzProductState(); + if (auto_launch_util::WillLaunchAtLogin(installer_state.target_path())) + auto_launch_util::SetWillLaunchAtLogin(false, FilePath()); + } + // First delete shortcuts from Start->Programs, Desktop & Quick Launch. DeleteChromeShortcuts(installer_state, product); |