Turn on session restore by default for mac on Lion

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 84 matching lines @@
   web_ui_->RegisterMessageCallback(
       "setHomePage",
       NewCallback(this, &BrowserOptionsHandler::SetHomePage));
   web_ui_->RegisterMessageCallback(
       "becomeDefaultBrowser",
       NewCallback(this, &BrowserOptionsHandler::BecomeDefaultBrowser));
   web_ui_->RegisterMessageCallback(
       "setDefaultSearchEngine",
       NewCallback(this, &BrowserOptionsHandler::SetDefaultSearchEngine));
   web_ui_->RegisterMessageCallback(
+      "setRestoreOnStartup",
+      NewCallback(this, &BrowserOptionsHandler::SetRestoreOnStartup));
+  web_ui_->RegisterMessageCallback(
       "removeStartupPages",
       NewCallback(this, &BrowserOptionsHandler::RemoveStartupPages));
   web_ui_->RegisterMessageCallback(
       "addStartupPage",
       NewCallback(this, &BrowserOptionsHandler::AddStartupPage));
   web_ui_->RegisterMessageCallback(
       "editStartupPage",
       NewCallback(this, &BrowserOptionsHandler::EditStartupPage));
   web_ui_->RegisterMessageCallback(
       "setStartupPagesToCurrentPages",
@@ skipping 22 matching lines @@
   // Create our favicon data source.
   profile->GetChromeURLDataManager()->AddDataSource(
       new FaviconSource(profile, FaviconSource::FAVICON));
 
   homepage_.Init(prefs::kHomePage, profile->GetPrefs(), NULL);
   default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,
                                g_browser_process->local_state(),
                                this);
   UpdateDefaultBrowserState();
 
+  UpdateRestoreOnStartup();
   startup_custom_pages_table_model_.reset(
       new CustomHomePagesTableModel(profile));
   startup_custom_pages_table_model_->SetObserver(this);
   UpdateStartupPages();
 
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(prefs::kURLsToRestoreOnStartup, this);
 
   UpdateSearchEngines();
 
@@ skipping 153 matching lines @@
 void BrowserOptionsHandler::UpdateSearchEngines() {
   template_url_service_ = TemplateURLServiceFactory::GetForProfile(
       web_ui_->GetProfile());
   if (template_url_service_) {
     template_url_service_->Load();
     template_url_service_->AddObserver(this);
     OnTemplateURLServiceChanged();
   }
 }
 
+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 =
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
   startup_custom_pages_table_model_->SetURLs(startup_pref.urls);
 }
 
 void BrowserOptionsHandler::OnModelChanged() {
   ListValue startup_pages;
   int page_count = startup_custom_pages_table_model_->RowCount();
@@ skipping 24 matching lines @@
   OnModelChanged();
 }
 
 void BrowserOptionsHandler::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     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 {
       NOTREACHED();
     }
   } else {
     NOTREACHED();
   }
 }
 
 void BrowserOptionsHandler::SetStartupPagesToCurrentPages(
     const ListValue* args) {
   startup_custom_pages_table_model_->SetToCurrentlyOpenPages();
   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;
     CHECK(args->GetString(i, &string_value));
 
     int selected_index;
     base::StringToInt(string_value, &selected_index);
     if (selected_index < 0 ||
         selected_index >= startup_custom_pages_table_model_->RowCount()) {
       NOTREACHED();
@@ skipping 109 matching lines @@
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions.Append(entry);
   }
 
   web_ui_->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }