Resolve the conflict that auto-launch has with the background mode feature (part 1).

chrome/browser/profiles/profile_shortcut_manager_win.cc

Index: chrome/browser/profiles/profile_shortcut_manager_win.cc
===================================================================
--- chrome/browser/profiles/profile_shortcut_manager_win.cc	(revision 132169)
+++ chrome/browser/profiles/profile_shortcut_manager_win.cc	(working copy)
@@ -208,10 +208,10 @@
 
 void DeleteAutoLaunchValueForProfile(
     const FilePath& profile_path) {
-  if (auto_launch_util::WillLaunchAtLogin(FilePath(),
-                                          profile_path.BaseName().value())) {
-      auto_launch_util::SetWillLaunchAtLogin(
-          false, FilePath(), profile_path.BaseName().value());
+  if (auto_launch_util::LaunchWithWindowAtLoginRequested(
+          FilePath(),
+          profile_path.BaseName().value())) {
+    auto_launch_util::DisableAutoStartAtLogin(profile_path.BaseName().value());

[grt (UTC plus 2), 2012/04/17 15:08:58]

LaunchWithWindowAtLogin vs. AutoStartAtLogin?

[Andrew T Wilson (Slow), 2012/04/18 01:07:36]

Agreed that it would be good to have consistent terminology:

BackgroundMode = launch on OS login with no open window
AutoStart (or something else) = launch on OS login *with* an open window

I'm OK with changing these terms if needed (although BackgroundMode has enough
history that I'd be somewhat loath to change it), as long as we're consistent.

   }
 }