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

chrome/installer/util/auto_launch_util.h

Index: chrome/installer/util/auto_launch_util.h
===================================================================
--- chrome/installer/util/auto_launch_util.h	(revision 132169)
+++ chrome/installer/util/auto_launch_util.h	(working copy)
@@ -15,26 +15,50 @@
 namespace auto_launch_util {
 
 // Returns whether the Chrome executable specified in |application_path| is set

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

Suggest: "...the Chrome executable in the directory |application_path|..."

-// to auto-launch at computer startup. NOTE: |application_path| is optional and
-// should be blank in most cases (as it will default to the application path of
-// the current executable). |profile_directory| is the name of the directory
-// (leaf, not the full path) that contains the profile that should be opened at
-// computer startup.
-bool WillLaunchAtLogin(const FilePath& application_path,
-                       const string16& profile_directory);
+// to auto-launch at computer startup with a given |command_line_switch|.

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

remove reference to |command_line_switch| from comment

+// NOTE: |application_path| is optional and should be blank in most cases (as

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

nit: move the optional argument(s) after all required arguments.

+// it will default to the application path of the current executable).
+// |profile_directory| is the name of the directory (leaf, not the full path)
+// that contains the profile that should be opened at computer startup.
+bool LaunchWithWindowAtLoginRequested(const FilePath& application_path,
+                                      const string16& profile_directory);
+// Same as above, except checks whether Chrome is set to launch in Background

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

nit: newline before comment

+// Mode. NOTE: Chrome being set to launch in the background (without a window)
+// does not necessarily mean that Chrome *will* launch without a window, since
+// the auto-start feature requires a window. In this case the function
+// LaunchWithWindowAtLoginRequested will also return true.
+bool LaunchInBackgroundAtLoginRequested(const FilePath& application_path,
+                                   const string16& profile_directory);

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

nit: indentation

 
-// Configures whether the Chrome executable should auto-launch at computer
-// startup. |application_path| is needed when |auto_launch| is true AND when
-// the caller is not the process being set to auto-launch, ie. the installer.
-// This is because |application_path|, if left blank, defaults to the
-// application path of the current executable. If |auto_launch| is true, then it
-// will auto-launch, otherwise it will be configured not to. |profile_directory|
-// is the name of the directory (leaf, not the full path) that contains the
-// profile that should be opened at computer startup.
-void SetWillLaunchAtLogin(bool auto_launch,
-                          const FilePath& application_path,
-                          const string16& profile_directory);
+// Disables all auto-start features. |profile_directory| is the name of the

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

nit: newline before comment

+// directory (leaf, not the full path) that contains the profile that was set
+// to be opened at computer startup.
+void DisableAllAutostartFeatures(const string16& profile_directory);

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

Please harmonize on one term (one of: Autostart, AutoStart, AutoLaunch,
auto_launch).

 
+// Configures Chrome to auto-launch at computer startup and show a window.
+// |application_path| is needed when the caller is not the process being set to
+// auto-launch, ie. the installer. This is because |application_path|, if left
+// blank, defaults to the application path of the current executable.
+// |profile_directory| is the name of the directory (leaf, not the full path)
+// that contains the profile that should be opened at computer startup.
+void EnableAutoStartAtLogin(const FilePath& application_path,
+                            const string16& profile_directory);
+
+// Disables auto-starting Chrome at computer startup. |profile_directory| is the
+// name of the directory (leaf, not the full path) that contains the profile
+// that was set to be opened at computer startup.
+void DisableAutoStartAtLogin(const string16& profile_directory);
+
+// Enables Chrome to start in the background at computer startup (without a
+// window being shown, except if EnableAutoStartAtLogin has been called).
+// In short, EnableBackgroundModeAtLogin is the no-window version of calling
+// EnableAutoStartAtLogin). If both are called, the no-window setting is
+// ignored.
+void EnableBackgroundModeAtLogin();
+
+// Disables auto-starting Chrome in background mode at computer startup.
+void DisableBackgroundModeAtLogin();
+
 }  // namespace auto_launch_util
 
 #endif  // CHROME_INSTALLER_UTIL_AUTO_LAUNCH_UTIL_H_