Fix issue with login items getting recreated.

chrome/browser/background/background_mode_manager.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 207 matching lines @@
 
   // We're going away, so exit background mode (does nothing if we aren't in
   // background mode currently). This is primarily needed for unit tests,
   // because in an actual running system we'd get an APP_TERMINATING
   // notification before being destroyed.
   EndBackgroundMode();
 }
 
 // static
 void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
-  registry->RegisterBooleanPref(prefs::kUserCreatedLoginItem, false);
+#if defined(OS_MACOSX)
   registry->RegisterBooleanPref(prefs::kUserRemovedLoginItem, false);
+  registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
+  registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
+#endif
   registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
 }
 
 
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
   // We don't want to register multiple times for one profile.
   DCHECK(background_mode_data_.find(profile) == background_mode_data_.end());
   BackgroundModeInfo bmd(new BackgroundModeData(current_command_id_++,
                                                 profile));
   background_mode_data_[profile] = bmd;
@@ skipping 135 matching lines @@
   if (!ShouldBeInBackgroundMode()) {
     // We've uninstalled our last background app, make sure we exit background
     // mode and no longer launch on startup.
     EnableLaunchOnStartup(false);
     EndBackgroundMode();
   } else {
     // We have at least one background app running - make sure we're in
     // background mode.
     if (!in_background_mode_) {
       // We're entering background mode - make sure we have launch-on-startup
-      // enabled.
-      // On a Mac, we use 'login items' mechanism which has user-facing UI so we
-      // don't want to stomp on user choice every time we start and load
-      // registered extensions. This means that if a background app is removed
-      // or added while Chrome is not running, we could leave Chrome in the
-      // wrong state, but this is better than constantly forcing Chrome to
-      // launch on startup even after the user removes the LoginItem manually.
-#if !defined(OS_MACOSX)
+      // enabled. On Mac, the platform-specific code tracks whether the user
+      // has deleted a login item in the past, and if so, no login item will
+      // be created (to avoid overriding the specific user action).
       EnableLaunchOnStartup(true);
-#endif
 
       StartBackgroundMode();
     }
     // List of applications changed so update the UI.
     UpdateStatusTrayIconContextMenu();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, ProfileInfoCacheObserver overrides
@@ skipping 218 matching lines @@
   return IsBackgroundModePrefEnabled() &&
       (GetBackgroundAppCount() > 0 || keep_alive_for_test_);
 }
 
 void BackgroundModeManager::OnBackgroundAppInstalled(
     const Extension* extension) {
   // Background mode is disabled - don't do anything.
   if (!IsBackgroundModePrefEnabled())
     return;
 
-  // Special behavior for the Mac: We enable "launch-on-startup" only on new app
-  // installation rather than every time we go into background mode. This is
-  // because the Mac exposes "Open at Login" UI to the user and we don't want to
-  // clobber the user's selection on every browser launch.
-  // Other platforms enable launch-on-startup in OnApplicationListChanged().
-#if defined(OS_MACOSX)
-  EnableLaunchOnStartup(true);
-#endif
-
   // Check if we need a status tray icon and make one if we do (needed so we
   // can display the app-installed notification below).
   CreateStatusTrayIcon();
 
   // Notify the user that a background app has been installed.
   if (extension)  // NULL when called by unit tests.
     DisplayAppInstalledNotification(extension);
 }
 
 void BackgroundModeManager::CreateStatusTrayIcon() {
@@ skipping 125 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }