diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 09:35:38 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 09:35:38 +0000 |
| commit | c149b9198168ca08da0a30d4fb63f0eb232d6001 (patch) | |
| tree | a01d50991492a1d81b661cf0f67995aa0b44ba71 /chrome/installer/setup/uninstall.cc | |
| parent | 82d3954ae9ccbd99fc48b99296e70f63dc883010 (diff) | |
| download | chromium_src-c149b9198168ca08da0a30d4fb63f0eb232d6001.zip chromium_src-c149b9198168ca08da0a30d4fb63f0eb232d6001.tar.gz chromium_src-c149b9198168ca08da0a30d4fb63f0eb232d6001.tar.bz2 | |
Resolve the conflict that auto-launch has with the background mode feature.
The Auto-launch experiment writes to the Run Registry key on Windows asking for Chrome to be started at login.
The BackgroundModeManager writes to another Run Registry key asking for Chrome to be started without a window.
We need to consolidate this into one Run key that specifies which feature you want as a command line flag to chrome.exe and make sure if a window is requested, then a window is shown (BackgroundModeManager doesn't care if the window is shown or not).
BUG=123139, 53600
TEST=QA has testing instructions on how to test the experimental auto-launch feature (requires branded build). Not sure about testing instructions for background mode.
Review URL: https://chromiumcodereview.appspot.com/9972012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/uninstall.cc')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index cb80ee8..836b384 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -777,12 +777,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state, if (is_chrome) { ClearRlzProductState(); - if (auto_launch_util::WillLaunchAtLogin( - installer_state.target_path(), - ASCIIToUTF16(chrome::kInitialProfile))) { - auto_launch_util::SetWillLaunchAtLogin( - false, FilePath(), ASCIIToUTF16(chrome::kInitialProfile)); - } + auto_launch_util::DisableAllAutoStartFeatures( + ASCIIToUTF16(chrome::kInitialProfile)); } // First delete shortcuts from Start->Programs, Desktop & Quick Launch. |