Cleanup: better session restore UI.

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 14 matching lines @@
     syncSetupCompleted: false,
 
     /**
      * The cached value of the instant.confirm_dialog_shown preference.
      * @type {bool}
      * @private
      */
     instantConfirmDialogShown_: false,
 
     /**
-     * True if the default cookie settings is session only. Used for deciding
-     * whether to show the session restore info dialog. The value is undefined
-     * until the preference has been read.
-     * @type {bool}
-     * @private
-     */
-    sessionOnlyCookies_: undefined,
-
-    /**
      * The cached value of the spellcheck.confirm_dialog_shown preference.
      * @type {bool}
      * @private
      */
     spellcheckConfirmDialogShown_: false,
 
     /**
-     * True if the "clear cookies and other site data on exit" setting is
-     * selected. Used for deciding whether to show the session restore info
-     * dialog. The value is undefined until the preference has been read.
-     * @type {bool}
-     * @private
-     */
-    clearCookiesOnExit_: undefined,
-
-    /**
      * Keeps track of whether |onShowHomeButtonChanged_| has been called. See
      * |onShowHomeButtonChanged_|.
      * @type {bool}
      * @private
      */
     onShowHomeButtonChangedCalled_: false,
 
     /**
      * @inheritDoc
      */
@@ skipping 66 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
-      // 'enable_restore_session_state' is forced to false).
-      this.sessionRestoreEnabled_ =
-          loadTimeData.getBoolean('enable_restore_session_state');
-      if (this.sessionRestoreEnabled_) {
-        $('startup-restore-session').onclick = function(event) {
-          if (!event.currentTarget.checked)
-            return;
-
-          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',
           this.onShowHomeButtonChanged_.bind(this));
 
       Preferences.getInstance().addEventListener('homepage',
           this.onHomePageChanged_.bind(this));
       Preferences.getInstance().addEventListener('homepage_is_newtabpage',
           this.onHomePageIsNtpChanged_.bind(this));
 
       $('change-home-page').onclick = function(event) {
@@ skipping 37 matching lines @@
             chrome.send('enableInstant');
           else
             OptionsPage.showPageByName('instantConfirm', false);
         } else {
           chrome.send('disableInstant');
         }
         return true;
       };
       Preferences.getInstance().addEventListener('instant.confirm_dialog_shown',
           this.onInstantConfirmDialogShownChanged_.bind(this));
-      Preferences.getInstance().addEventListener(
-          'restore_session_state.dialog_shown',
-          this.onSessionRestoreDialogShownChanged_.bind(this));
-      var self = this;
-      Preferences.getInstance().addEventListener(
-          'profile.clear_site_data_on_exit',
-          function(event) {
-            if (event.value && typeof event.value['value'] != 'undefined') {
-              self.clearCookiesOnExit_ = event.value['value'] == true;
-            }
-          });
 
       // Users section.
       if (loadTimeData.valueExists('profilesInfo')) {
         $('profiles-section').hidden = false;
 
         var profilesList = $('profiles-list');
         options.browser_options.ProfileList.decorate(profilesList);
         profilesList.autoExpands = true;
 
         this.setProfilesInfo_(loadTimeData.getValue('profilesInfo'));
@@ skipping 543 matching lines @@
      * Called when the value of the instant.confirm_dialog_shown preference
      * changes. Cache this value.
      * @param {Event} event Change event.
      * @private
      */
     onInstantConfirmDialogShownChanged_: function(event) {
       this.instantConfirmDialogShown_ = event.value['value'];
     },
 
     /**
-     * Called when the value of the restore_session_state.dialog_shown
-     * preference changes.
-     * @param {Event} event Change event.
-     * @private
-     */
-    onSessionRestoreDialogShownChanged_: function(event) {
-      this.sessionRestoreDialogShown_ = event.value['value'];
-    },
-
-    /**
      * Called when the value of the spellcheck.confirm_dialog_shown preference
      * changes. Cache this value.
      * @param {Event} event Change event.
      * @private
      */
     onSpellcheckConfirmDialogShownChanged_: function(event) {
       this.spellcheckConfirmDialogShown_ = event.value['value'];
     },
 
     /**
      * Called when the value of the download.default_directory preference
      * changes.
      * @param {Event} event Change event.
      * @private
      */
     onDefaultDownloadDirectoryChanged_: function(event) {
       $('downloadLocationPath').value = event.value['value'];
       if (cr.isChromeOS) {
         // On ChromeOS, strip out /special for drive paths, and
         // /home/chronos/user for local files.
         $('downloadLocationPath').value = $('downloadLocationPath').value.
             replace(/^\/(special|home\/chronos\/user)/, '');
       }
     },
 
     /**
-     * Displays the session restore info dialog if options depending on sessions
-     * (session only cookies or clearning data on exit) are selected, and the
-     * dialog has never been shown.
-     * @private
-     * @return {boolean} True if the dialog is shown, false otherwise.
-     */
-    maybeShowSessionRestoreDialog_: function() {
-      // Don't show this dialog in Guest mode.
-      if (cr.isChromeOS && UIAccountTweaks.loggedInAsGuest())
-        return false;
-      // If some of the needed preferences haven't been read yet, the
-      // corresponding member variable will be undefined and we won't display
-      // the dialog yet.
-      if (this.userHasSelectedSessionContentSettings_() &&
-          this.sessionRestoreDialogShown_ === false) {
-        OptionsPage.showPageByName('sessionRestoreOverlay', false);
-        return true;
-      }
-      return false;
-    },
-
-    /**
-     * Called when the user clicks the "ok" button in the session restore
-     * dialog.
-     */
-    sessionRestoreDialogOk: function() {
-      // Set the preference.
-      $('startup-restore-session').savePrefState();
-      this.sessionRestoreDialogShown_ = true;
-      Preferences.setBooleanPref('restore_session_state.dialog_shown', true);
-    },
-
-    /**
-     * Called when the user clicks the "cancel" button in the session restore
-     * dialog.
-     */
-    sessionRestoreDialogCancel: function() {
-      // The preference was never set to "continue where I left off". Update the
-      // UI to reflect the preference.
-      $('startup-newtab').resetPrefState();
-      $('startup-restore-session').resetPrefState();
-      $('startup-show-pages').resetPrefState();
-    },
-
-    /**
-     * Returns true if the user has selected content settings which rely on
-     * sessions: clearning the browsing data on exit or defaulting the cookie
-     * content setting to session only.
-     * @private
-     */
-    userHasSelectedSessionContentSettings_: function() {
-      return this.clearCookiesOnExit_ || this.sessionOnlyCookies_;
-    },
-
-    /**
      * Update the Default Browsers section based on the current state.
      * @param {string} statusString Description of the current default state.
      * @param {boolean} isDefault Whether or not the browser is currently
      *     default.
      * @param {boolean} canBeDefault Whether or not the browser can be default.
      * @private
      */
     updateDefaultBrowserState_: function(statusString, isDefault,
                                          canBeDefault) {
       if (!cr.isChromeOS) {
@@ skipping 497 matching lines @@
      */
     removeBluetoothDevice_: function(address) {
       var index = $('bluetooth-unpaired-devices-list').find(address);
       if (index != undefined) {
         $('bluetooth-unpaired-devices-list').deleteItemAtIndex(index);
       } else {
         index = $('bluetooth-paired-devices-list').find(address);
         if (index != undefined)
           $('bluetooth-paired-devices-list').deleteItemAtIndex(index);
       }
-    },
-
-    /**
-     * Called when the default content setting value for a content type changes.
-     * @param {Object} dict A mapping content setting types to the default
-     * value.
-     * @private
-     */
-    setContentFilterSettingsValue_: function(dict) {
-      if ('cookies' in dict && 'value' in dict['cookies'])
-        this.sessionOnlyCookies_ = dict['cookies']['value'] == 'session';
     }
 
   };
 
   //Forward public APIs to private implementations.
   [
     'addBluetoothDevice',
     'getCurrentProfile',
     'getStartStopSyncButton',
     'hideBluetoothSettings',
     'removeCloudPrintConnectorSection',
     'removeBluetoothDevice',
     'setAutoOpenFileTypesDisplayed',
     'setBackgroundModeCheckboxState',
     'setBluetoothState',
     'setCheckRevocationCheckboxState',
-    'setContentFilterSettingsValue',
     'setFontSize',
     'setGtkThemeButtonEnabled',
     'setHighContrastCheckboxState',
     'setMetricsReportingCheckboxState',
     'setMetricsReportingSettingVisibility',
     'setPasswordGenerationSettingVisibility',
     'setProfilesInfo',
     'setScreenMagnifierCheckboxState',
     'setSpokenFeedbackCheckboxState',
     'setThemesResetButtonEnabled',
@@ skipping 28 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });