chrome/browser/resources/options/content_settings_exceptions_area.js - Issue 1372353004: Making structure for ContentSettings and its corresponding strings.

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/options/content_settings_exceptions_area.js

Issue 1372353004: Making structure for ContentSettings and its corresponding strings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes as per review comments. Created 5 years, 2 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

« chrome/browser/extensions/api/content_settings/content_settings_api.cc ('K') | « chrome/browser/extensions/api/content_settings/content_settings_store.cc ('k') | components/content_settings/core/browser/content_settings_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/content_settings_exceptions_area.js

diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js

index 273c130f2182d66a095ade3ccb7093ae445453a6..03ad5aeda3a43cb492ff303eaa9c0f1062b8407d 100644

--- a/chrome/browser/resources/options/content_settings_exceptions_area.js

+++ b/chrome/browser/resources/options/content_settings_exceptions_area.js

@@ -86,14 +86,14 @@ cr.define('options.contentSettings', function() {

if (this.contentType == 'plugins') {

var optionDetect = cr.doc.createElement('option');

optionDetect.textContent = loadTimeData.getString('detectException');

- optionDetect.value = 'detect';

+ optionDetect.value = 'detect_important_content';

Bernhard Bauer 2015/10/05 14:31:48 I think you also need to update chrome/browser/res

Deepak 2015/10/06 15:18:41 Done.

select.appendChild(optionDetect);

}

if (this.contentType == 'cookies') {

var optionSession = cr.doc.createElement('option');

optionSession.textContent = loadTimeData.getString('sessionException');

- optionSession.value = 'session';

+ optionSession.value = 'session_only';

select.appendChild(optionSession);

}

@@ -265,9 +265,9 @@ cr.define('options.contentSettings', function() {

return loadTimeData.getString('blockException');

else if (setting == 'ask')

return loadTimeData.getString('askException');

- else if (setting == 'session')

+ else if (setting == 'session_only')

return loadTimeData.getString('sessionException');

- else if (setting == 'detect')

+ else if (setting == 'detect_important_content')

return loadTimeData.getString('detectException');

else if (setting == 'default')

return '';