Make the auto-launch experiment profile-aware.

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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 23 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 350 matching lines @@
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
 
   UpdateSearchEngines();
   UpdateHomePageLabel();
   ObserveThemeChanged();
 
   autocomplete_controller_.reset(new AutocompleteController(profile, this));
 
 #if defined(OS_WIN)
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-      base::Bind(&BrowserOptionsHandler::CheckAutoLaunch,
-                 weak_ptr_factory_for_ui_.GetWeakPtr(),
-                 weak_ptr_factory_for_file_.GetWeakPtr()));
-  weak_ptr_factory_for_ui_.DetachFromThread();
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (!command_line.HasSwitch(switches::kChromeFrame) &&
+      !command_line.HasSwitch(switches::kUserDataDir)) {
+    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+        base::Bind(&BrowserOptionsHandler::CheckAutoLaunch,
+                   weak_ptr_factory_for_ui_.GetWeakPtr(),
+                   weak_ptr_factory_for_file_.GetWeakPtr(),
+                   profile->GetPath()));
+    weak_ptr_factory_for_ui_.DetachFromThread();
+  }
 #endif
 }
 
 void BrowserOptionsHandler::CheckAutoLaunch(
-    base::WeakPtr<BrowserOptionsHandler> weak_this) {
+    base::WeakPtr<BrowserOptionsHandler> weak_this,
+    const FilePath& profile_path) {
 #if defined(OS_WIN)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
+  // We don't support this 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())));
+                 auto_launch_util::WillLaunchAtLogin(
+                     FilePath(),
+                     profile_path.BaseName().value())));
 #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) {
     web_ui()->RegisterMessageCallback("toggleAutoLaunch",
         base::Bind(&BrowserOptionsHandler::ToggleAutoLaunch,
         base::Unretained(this)));
 
     base::FundamentalValue enabled(will_launch_at_login);
     web_ui()->CallJavascriptFunction("BrowserOptions.updateAutoLaunchState",
-      enabled);
+                                     enabled);
   }
 #endif
 }
 
 void BrowserOptionsHandler::UpdateDefaultBrowserState() {
   // Check for side-by-side first.
   if (!ShellIntegration::CanSetAsDefaultBrowser()) {
     SetDefaultBrowserUIString(IDS_OPTIONS_DEFAULTBROWSER_SXS);
     return;
   }
@@ skipping 205 matching lines @@
 #if defined(OS_WIN)
   if (!auto_launch_trial::IsInAutoLaunchGroup())
     return;
 
   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()));
+      base::Bind(&auto_launch_util::SetWillLaunchAtLogin, enable,
+                 FilePath(), 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 113 matching lines @@
 }
 
 void BrowserOptionsHandler::IncreaseScreenBrightnessCallback(
     const ListValue* args) {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       IncreaseScreenBrightness();
 }
 #endif
 
 }  // namespace options2