chrome/browser/ui/webui/options2/content_settings_handler2.cc - 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/ui/webui/options2/content_settings_handler2.cc

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/ui/webui/options2/content_settings_handler2.cc

diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc

index 17fda03b0c27ff9c7bfe955434dfcd752e1b4d86..2db3de7dec5b5baadb0e4f9a7b3f80726f507cfc 100644

--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc

+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc

@@ -287,10 +287,10 @@ void ContentSettingsHandler::GetLocalizedValues(

IDS_CONTENT_SETTINGS_TITLE);

localized_strings->SetBoolean("enable_web_intents",

web_intents::IsWebIntentsEnabled());

+ // TODO(marja): clean up the options UI after the decision on the session

+ // restore changes has stabilized.

localized_strings->SetBoolean(

- "enable_restore_session_state",

- !CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableRestoreSessionState));

+ "enable_restore_session_state", false);

}

void ContentSettingsHandler::InitializeHandler() {

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