Honor session content settings even if "continue where I left off" is selected.

chrome/browser/resources/options2/browser_options.js

 // 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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
 
   //
@@ skipping 89 matching lines @@
 
       // On Startup section.
       Preferences.getInstance().addEventListener('session.restore_on_startup',
          this.onRestoreOnStartupChanged_.bind(this));
 
       $('startup-set-pages').onclick = function() {
         OptionsPage.navigateToPage('startup');
       };
 
       // Session restore.
+      // TODO(marja): clean up the options UI after the decision on the session
+      // restore changes has stabilized. For now, only the startup option is
+      // renamed to "continue where I left off", but the session related content
+      // settings are not disabled or overridden (because
+      // templateData.enable_restore_session_state is forced to false).
       this.sessionRestoreEnabled_ = templateData.enable_restore_session_state;
       if (this.sessionRestoreEnabled_) {
-        $('old-startup-last-text').hidden = true;
-        $('new-startup-last-text').hidden = false;
         $('startup-restore-session').onchange = function(event) {
           if (!BrowserOptions.getInstance().maybeShowSessionRestoreDialog_()) {
             // The dialog is not shown; handle the event normally.
             event.currentTarget.savePrefState();
           }
         };
       }
 
       // Appearance section.
       Preferences.getInstance().addEventListener('browser.show_home_button',
@@ skipping 1200 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });