chrome/browser/resources/options2/browser_options.js - Issue 9965012: Honor session content settings even if "continue where I left off" is selected.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/options2/browser_options.js

Issue 9965012: Honor session content settings even if "continue where I left off" is selected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Only honor the "clear on exit", not session-only cookies. Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/resources/options2/browser_options.js

diff --git a/chrome/browser/resources/options2/browser_options.js b/chrome/browser/resources/options2/browser_options.js

index 363acebeabd69f1cf213fa3e759510895dbdd8c0..03b3209a4bf1dcbfa0556734c6ac6ab67a70e1a7 100644

--- a/chrome/browser/resources/options2/browser_options.js

+++ b/chrome/browser/resources/options2/browser_options.js

@@ -107,10 +107,13 @@ cr.define('options', function() {

};

// 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.

« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/resources/options2/startup_section.html » ('j') | no next file with comments »