Turn on session restore by default for mac on Lion

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 622b6e01874cb883facd3623b64b8d1070e65aea..6f5580fcc5bebb9e67cffa073095b804939cc8c7 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -102,6 +102,9 @@ void BrowserOptionsHandler::RegisterMessages() {
       "setDefaultSearchEngine",
       NewCallback(this, &BrowserOptionsHandler::SetDefaultSearchEngine));
   web_ui_->RegisterMessageCallback(
+      "setRestoreOnStartup",
+      NewCallback(this, &BrowserOptionsHandler::SetRestoreOnStartup));
+  web_ui_->RegisterMessageCallback(
       "removeStartupPages",
       NewCallback(this, &BrowserOptionsHandler::RemoveStartupPages));
   web_ui_->RegisterMessageCallback(
@@ -144,6 +147,7 @@ void BrowserOptionsHandler::Initialize() {
                                this);
   UpdateDefaultBrowserState();
 
+  UpdateRestoreOnStartup();
   startup_custom_pages_table_model_.reset(
       new CustomHomePagesTableModel(profile));
   startup_custom_pages_table_model_->SetObserver(this);
@@ -317,6 +321,15 @@ void BrowserOptionsHandler::UpdateSearchEngines() {
   }
 }
 
+void BrowserOptionsHandler::UpdateRestoreOnStartup() {
+  Profile* profile = web_ui_->GetProfile();
+  const SessionStartupPref startup_pref =
+      SessionStartupPref::GetStartupPref(profile->GetPrefs());
+  FundamentalValue restore_on_startup(startup_pref.type);
+  web_ui_->CallJavascriptFunction("BrowserOptions.updateRestoreOnStartup",
+                                  restore_on_startup);
+}
+
 void BrowserOptionsHandler::UpdateStartupPages() {
   Profile* profile = web_ui_->GetProfile();
   const SessionStartupPref startup_pref =
@@ -361,6 +374,8 @@ void BrowserOptionsHandler::Observe(int type,
     std::string* pref = Details<std::string>(details).ptr();
     if (*pref == prefs::kDefaultBrowserSettingEnabled) {
       UpdateDefaultBrowserState();
+    } else if (*pref == prefs::kRestoreOnStartup) {
+      UpdateRestoreOnStartup();
     } else if (*pref == prefs::kURLsToRestoreOnStartup) {
       UpdateStartupPages();
     } else {
@@ -377,6 +392,28 @@ void BrowserOptionsHandler::SetStartupPagesToCurrentPages(
   SaveStartupPagesPref();
 }
 
+void BrowserOptionsHandler::SetRestoreOnStartup(const ListValue* args) {
+  std::string pref_string;
+  CHECK_EQ(args->GetSize(), 1UL);
+  CHECK(args->GetString(0, &pref_string));
+
+  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+
+  SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
+  if (pref_string == "0") {
+    pref.type = SessionStartupPref::DEFAULT;
+  } else if (pref_string == "1") {
+    pref.type = SessionStartupPref::LAST;
+  } else if (pref_string == "2") {
+    pref.type = SessionStartupPref::URLS;
+  } else {
+    NOTREACHED();
+    return;
+  }
+
+  SessionStartupPref::SetStartupPref(prefs, pref);
+}
+
 void BrowserOptionsHandler::RemoveStartupPages(const ListValue* args) {
   for (int i = args->GetSize() - 1; i >= 0; --i) {
     std::string string_value;