Make the default startup pref to be NTP also on Mac.

chrome/browser/prefs/session_startup_pref.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/prefs/session_startup_pref.h"
 
 #include <string>
 
 #include "base/values.h"
+#include "base/version.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/common/pref_names.h"
 
 #if defined(OS_MACOSX)
@@ skipping 45 matching lines @@
   prefs->RegisterListPref(prefs::kURLsToRestoreOnStartup,
                           PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kRestoreOnStartupMigrated,
                              false,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 // static
 SessionStartupPref::Type SessionStartupPref::GetDefaultStartupType() {
 #if defined(OS_CHROMEOS)
-  SessionStartupPref::Type type = SessionStartupPref::LAST;
+  return SessionStartupPref::LAST;
 #else
-  SessionStartupPref::Type type = SessionStartupPref::DEFAULT;
+  return SessionStartupPref::DEFAULT;
 #endif
-
-#if defined(OS_MACOSX)
-  // Use Lion's system preference, if it is set.
-  if (restore_utils::IsWindowRestoreEnabled())
-    type = SessionStartupPref::LAST;
-#endif
-
-  return type;
 }
 
 // static
 void SessionStartupPref::SetStartupPref(
     Profile* profile,
     const SessionStartupPref& pref) {
   DCHECK(profile);
   SetStartupPref(profile->GetPrefs(), pref);
 }
 
@@ skipping 25 matching lines @@
   DCHECK(profile);
   return GetStartupPref(profile->GetPrefs());
 }
 
 // static
 SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) {
   DCHECK(prefs);
 
   MigrateIfNecessary(prefs);
 
+#if defined(OS_MACOSX)
+  if (restore_utils::IsWindowRestoreEnabled())
+    MigrateMacDefaultPrefIfNecessary(prefs);
+#endif
+
   SessionStartupPref pref(
       PrefValueToType(prefs->GetInteger(prefs::kRestoreOnStartup)));
 
   // Always load the urls, even if the pref type isn't URLS. This way the
   // preferences panels can show the user their last choice.
   const ListValue* url_list = prefs->GetList(prefs::kURLsToRestoreOnStartup);
   URLListToPref(url_list, &pref);
 
   return pref;
 }
@@ skipping 40 matching lines @@
       // default value is "open the new tab page" which is what we want.)
       prefs->SetInteger(prefs::kRestoreOnStartup, kPrefValueURLs);
       SetNewURLList(prefs);
     }
 
     prefs->SetBoolean(prefs::kRestoreOnStartupMigrated, true);
   }
 }
 
 // static
+void SessionStartupPref::MigrateMacDefaultPrefIfNecessary(PrefService* prefs) {
+  DCHECK(prefs);
+  // The default startup pref used to be LAST, now it is DEFAULT. Don't change
+  // the setting for existing profiles (even if the user has never changed it),
+  // but make new profiles default to DEFAULT.
+  bool old_profile_version = Version(prefs->GetString(
+      prefs::kProfileCreatedByVersion)).IsOlderThan("21.0.1180.0");
+  if (old_profile_version && TypeIsDefault(prefs))
+    prefs->SetInteger(prefs::kRestoreOnStartup, kPrefValueLast);

[Joao da Silva, 2012/06/19 15:23:00]

kPrevValueLast might not be the right value here, depending on the Lion system
setting. If restore_utils::IsWindowRestoreEnabled() is false, then this should
be kPrefValueNewTab.

[marja, 2012/06/19 15:24:48]

This code only gets executed if restore_utils::IsWindowRestoreEnabled() is true
(see above).

+}
+
+// static
 bool SessionStartupPref::TypeIsManaged(PrefService* prefs) {
   DCHECK(prefs);
   const PrefService::Preference* pref_restore =
       prefs->FindPreference(prefs::kRestoreOnStartup);
   DCHECK(pref_restore);
   return pref_restore->IsManaged();
 }
 
 // static
 bool SessionStartupPref::URLsAreManaged(PrefService* prefs) {
@@ skipping 46 matching lines @@
   CHECK(prefs_watcher->GetBackupForPref(
             prefs::kURLsToRestoreOnStartup)->GetAsList(&url_list));
   URLListToPref(url_list, &backup_pref);
 
   return backup_pref;
 }
 
 SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
 
 SessionStartupPref::~SessionStartupPref() {}