Camino only - Bug 360839: Expose preference for saving session state.

camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/classes.nib

@@ -17,6 +17,7 @@
                 checkboxStartPageClicked = id; 
                 defaultBrowserChange = id; 
                 defaultFeedViewerChange = id; 
+                rememberWindowStateCheckboxClicked = id; 
                 runOpenDialogToSelectBrowser = id; 
                 runOpenDialogToSelectFeedViewer = id; 
                 warningCheckboxClicked = id; 
@@ -27,6 +28,7 @@
                 checkboxCheckDefaultBrowserOnLaunch = NSButton; 
                 checkboxNewTabBlank = NSButton; 
                 checkboxNewWindowBlank = NSButton; 
+                checkboxRememberWindowState = NSButton; 
                 checkboxWarnWhenClosing = NSButton; 
                 defaultBrowserPopUp = NSPopUpButton; 
                 defaultFeedViewerPopUp = NSPopUpButton; 

camino/PreferencePanes/Navigation/English.lproj/Navigation.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>83 20 462 260 0 0 1024 746 </string>
+	<string>10 8 462 260 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
 	<key>IBOpenObjects</key>

camino/PreferencePanes/Navigation/Navigation.h

@@ -49,12 +49,14 @@
   IBOutlet NSPopUpButton* defaultFeedViewerPopUp;
   IBOutlet NSButton*      checkboxCheckDefaultBrowserOnLaunch;
   IBOutlet NSButton*      checkboxWarnWhenClosing;
+  IBOutlet NSButton*      checkboxRememberWindowState;
 }
 
 - (IBAction)checkboxStartPageClicked:(id)sender;
 - (IBAction)defaultBrowserChange:(id)sender;
 - (IBAction)defaultFeedViewerChange:(id)sender;
 - (IBAction)warningCheckboxClicked:(id)sender;
+- (IBAction)rememberWindowStateCheckboxClicked:(id)sender;
 
 // method to be called so that when the default feed viewer is modified
 // in FeedServiceController, we can rebuild the list here as well.

camino/PreferencePanes/Navigation/Navigation.mm

@@ -83,12 +83,12 @@ const int kDefaultExpireDays = 9;
     return;
 
   BOOL gotPref;
-  
+
   // 0: blank page. 1: home page. 2: last page visited. Our behaviour here should
   // match what the browser does when the prefs don't exist.
   if (([self getIntPref:"browser.startup.page" withSuccess:&gotPref] == 1) || !gotPref)
     [checkboxNewWindowBlank setState:NSOnState];
-  
+
   if (([self getIntPref:"browser.tabs.startPage" withSuccess:&gotPref] == 1))
     [checkboxNewTabBlank setState:NSOnState];
 
@@ -97,15 +97,18 @@ const int kDefaultExpireDays = 9;
 
   if ([self getBooleanPref:"camino.warn_when_closing" withSuccess:&gotPref])
     [checkboxWarnWhenClosing setState:NSOnState];
-  
+
+  if ([self getBooleanPref:"camino.remember_window_state" withSuccess:&gotPref])
+    [checkboxRememberWindowState setState:NSOnState];
+
   [textFieldHomePage setStringValue:[self getCurrentHomePage]];
-  
+
   // set up default browser menu
   [self updateDefaultBrowserMenu];
- 
+
   // set up the feed viewer menu
   [self updateDefaultFeedViewerMenu];
-  
+
   // register notification if the default feed viewer is changed in the FeedServiceController
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(updateDefaultFeedViewerMenu)
@@ -146,6 +149,12 @@ const int kDefaultExpireDays = 9;
     [self setPref:"camino.warn_when_closing" toBoolean:([sender state] == NSOnState)];
 }
 
+- (IBAction)rememberWindowStateCheckboxClicked:(id)sender
+{
+  if (sender == checkboxRememberWindowState)
+    [self setPref:"camino.remember_window_state" toBoolean:([sender state] == NSOnState)];
+}
+
 - (NSString*)getCurrentHomePage
 {
   BOOL gotPref;