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

chrome/browser/ui/webui/options2/browser_options_handler2.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 630 matching lines @@
   // Auto-launch is not supported for secondary profiles yet.
   if (profile_path.BaseName().value() != ASCIIToUTF16(chrome::kInitialProfile))
     return;
 
   // Pass in weak pointer to this to avoid race if BrowserOptionsHandler is
   // deleted.
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowserOptionsHandler::CheckAutoLaunchCallback,
                  weak_this,
                  auto_launch_trial::IsInAutoLaunchGroup(),
-                 auto_launch_util::WillLaunchAtLogin(
-                     FilePath(),
-                     profile_path.BaseName().value())));
+                 auto_launch_util::AutoStartRequested(
+                     profile_path.BaseName().value(),
+                     true,  // Window requested.
+                     FilePath())));
 #endif
 }
 
 void BrowserOptionsHandler::CheckAutoLaunchCallback(
     bool is_in_auto_launch_group,
     bool will_launch_at_login) {
 #if defined(OS_WIN)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (is_in_auto_launch_group) {
@@ skipping 212 matching lines @@
 
   bool enable;
   CHECK_EQ(args->GetSize(), 1U);
   CHECK(args->GetBoolean(0, &enable));
 
   // Make sure we keep track of how many disable and how many enable.
   auto_launch_trial::UpdateToggleAutoLaunchMetric(enable);
   Profile* profile = Profile::FromWebUI(web_ui());
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&auto_launch_util::SetWillLaunchAtLogin, enable,
-                 FilePath(), profile->GetPath().BaseName().value()));
+      enable ? base::Bind(&auto_launch_util::EnableForegroundStartAtLogin,
+                          profile->GetPath().BaseName().value(), FilePath()) :
+               base::Bind(&auto_launch_util::DisableForegroundStartAtLogin,
+                          profile->GetPath().BaseName().value()));
 #endif  // OS_WIN
 }
 
 void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   base::FundamentalValue enabled(
       InstantFieldTrial::IsInstantExperiment(profile) &&
       !InstantFieldTrial::IsHiddenExperiment(profile));
   web_ui()->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
                                    enabled);
@@ skipping 510 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2