Turn on session restore by default for mac on Lion

chrome/browser/prefs/session_startup_pref.cc

 // Copyright (c) 2011 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/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.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"
+#ifdef OS_MACOSX

[Robert Sesek, 2011/07/28 18:30:22]

Break this out to be in its own #include block

[dhollowa, 2011/07/28 20:05:35]

Done.

+#include "chrome/browser/ui/cocoa/window_restore_utils.h"
+#endif
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // For historical reasons the enum and value registered in the prefs don't line
 // up. These are the values registered in prefs.
 const int kPrefValueDefault = 0;
 const int kPrefValueLast = 1;
 const int kPrefValueURLs = 4;
 
 // Converts a SessionStartupPref::Type to an integer written to prefs.
 int TypeToPrefValue(SessionStartupPref::Type type) {
   switch (type) {
     case SessionStartupPref::LAST:   return kPrefValueLast;
     case SessionStartupPref::URLS:   return kPrefValueURLs;
     default:                         return kPrefValueDefault;
   }
 }
 
 // Converts an integer pref value to a SessionStartupPref::Type.
 SessionStartupPref::Type PrefValueToType(int pref_value) {
   switch (pref_value) {
     case kPrefValueLast:  return SessionStartupPref::LAST;
     case kPrefValueURLs:  return SessionStartupPref::URLS;
     default:              return SessionStartupPref::DEFAULT;
   }
 }
 
+bool TypeIsDefaultValue(PrefService* prefs) {
+  const PrefService::Preference* pref_restore =
+      prefs->FindPreference(prefs::kRestoreOnStartup);
+  return pref_restore->IsDefaultValue();
+}
+
 }  // namespace
 
 // static
 void SessionStartupPref::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kRestoreOnStartup,
                              TypeToPrefValue(
                                  browser_defaults::kDefaultSessionStartupType),
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kURLsToRestoreOnStartup,
                           PrefService::SYNCABLE_PREF);
@@ skipping 35 matching lines @@
   DCHECK(profile);
   return GetStartupPref(profile->GetPrefs());
 }
 
 // static
 SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) {
   DCHECK(prefs);
   SessionStartupPref pref(
       PrefValueToType(prefs->GetInteger(prefs::kRestoreOnStartup)));
 
+#ifdef OS_MACOSX
+  if (TypeIsDefaultValue(prefs)) {
+    if (restore_utils::IsWindowRestoreEnabled())
+      pref.type = SessionStartupPref::LAST;
+    else
+      pref.type = SessionStartupPref::DEFAULT;
+  }
+#endif
+
   // 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_pref_list = prefs->GetList(
       prefs::kURLsToRestoreOnStartup);
   if (url_pref_list) {
     for (size_t i = 0; i < url_pref_list->GetSize(); ++i) {
       Value* value = NULL;
       if (url_pref_list->Get(i, &value)) {
         std::string url_text;
         if (value->GetAsString(&url_text)) {
@@ skipping 22 matching lines @@
       prefs->FindPreference(prefs::kURLsToRestoreOnStartup);
   DCHECK(pref_urls);
   return pref_urls->IsManaged();
 }
 
 SessionStartupPref::SessionStartupPref() : type(DEFAULT) {}
 
 SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
 
 SessionStartupPref::~SessionStartupPref() {}