chrome/browser/resources/options/content_settings_exceptions_area.js - Issue 8585047: Add a section for the fullscreen JS API in the content settings page.

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 8585047: Add a section for the fullscreen JS API in the content settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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/content_settings/host_content_settings_map.cc ('K') | « chrome/browser/resources/options/content_settings_exceptions_area.html ('k') | chrome/browser/ui/webui/options/content_settings_handler.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 4f544b22aa1a300788ff2ef4991016912bedd97b..a8a58b13850ffec388112e198ea6ed70c6fe0fa1 100644

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

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

@@ -82,10 +82,12 @@ cr.define('options.contentSettings', function() {

select.appendChild(optionSession);

}

- var optionBlock = cr.doc.createElement('option');

- optionBlock.textContent = templateData.blockException;

- optionBlock.value = 'block';

- select.appendChild(optionBlock);

+ if (this.contentType != 'fullscreen') {

+ var optionBlock = cr.doc.createElement('option');

+ optionBlock.textContent = templateData.blockException;

+ optionBlock.value = 'block';

+ select.appendChild(optionBlock);

+ }

this.contentElement.appendChild(select);

select.className = 'exception-setting';

@@ -361,7 +363,8 @@ cr.define('options.contentSettings', function() {

// Whether the exceptions in this list allow an 'Ask every time' option.

this.enableAskOption = (this.contentType == 'plugins' &&

templateData.enable_click_to_play);

+ this.enableAskOption = (this.enableAskOption ||

+ this.contentType == 'fullscreen');

this.autoExpands = true;

this.reset();