Index: chrome/installer/setup/setup_main.cc |
=================================================================== |
--- chrome/installer/setup/setup_main.cc (revision 111708) |
+++ chrome/installer/setup/setup_main.cc (working copy) |
@@ -34,6 +34,7 @@ |
#include "chrome/installer/setup/setup_constants.h" |
#include "chrome/installer/setup/setup_util.h" |
#include "chrome/installer/setup/uninstall.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" |
@@ -718,6 +719,16 @@ |
&do_not_launch_chrome); |
if (!system_install && !do_not_launch_chrome) |
chrome_install->LaunchChrome(installer_state.target_path()); |
+ |
+ // Add auto-launch key if specified in master preferences. |
grt (UTC plus 2)
2011/11/29 18:55:45
i think this belongs in install.cc's InstallOrUpda
Finnur
2011/11/29 23:48:30
Moved.
|
+ bool auto_launch_chrome = false; |
+ prefs.GetBool( |
+ installer::master_preferences::kAutoLaunchChrome, |
+ &auto_launch_chrome); |
+ if (auto_launch_chrome) { |
+ auto_launch_util::SetIsAutoLaunched( |
+ true, installer_state.target_path()); |
+ } |
} |
} else if ((install_status == installer::NEW_VERSION_UPDATED) || |
(install_status == installer::IN_USE_UPDATED)) { |