Chromium Code Reviews| Index: chrome/installer/setup/install.cc |
| =================================================================== |
| --- chrome/installer/setup/install.cc (revision 111708) |
| +++ chrome/installer/setup/install.cc (working copy) |
| @@ -18,6 +18,7 @@ |
| #include "base/utf_string_conversions.h" |
| #include "chrome/installer/setup/setup_constants.h" |
| #include "chrome/installer/setup/install_worker.h" |
| +#include "chrome/installer/util/auto_launch_util.h" |
| #include "chrome/installer/util/browser_distribution.h" |
| #include "chrome/installer/util/create_reg_key_work_item.h" |
| #include "chrome/installer/util/delete_after_reboot_helper.h" |
| @@ -410,6 +411,18 @@ |
| &force_chrome_default_for_user); |
| } |
| + if (result == FIRST_INSTALL_SUCCESS) { |
|
grt (UTC plus 2)
2011/12/01 04:45:02
move this new code below the call to RegisterChrom
|
| + // Add auto-launch key if specified in master preferences. |
| + bool auto_launch_chrome = false; |
| + prefs.GetBool( |
| + installer::master_preferences::kAutoLaunchChrome, |
| + &auto_launch_chrome); |
| + if (auto_launch_chrome) { |
| + auto_launch_util::SetWillLaunchAtLogin( |
| + true, installer_state.target_path()); |
| + } |
| + } |
| + |
| installer_state.UpdateStage(installer::REGISTERING_CHROME); |
| RegisterChromeOnMachine(installer_state, *chrome_install, |