chrome/browser/resources/settings/site_settings/site_settings_behavior.js - Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

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/settings/site_settings/site_settings_behavior.js

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)

Patch Set: Fix Mac. Created 4 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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc ('k') | chrome/browser/resources/settings/site_settings/site_settings_category.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings/site_settings_behavior.js

diff --git a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js

index bd0b1ca0488bfda9edfe70df70cb118e0b123865..f467e8873057de00359308b28eefea21dfa5eedc 100644

--- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js

+++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js

@@ -397,16 +397,12 @@ var SiteSettingsBehaviorImpl = {

/**

* Returns true if the passed content setting is considered 'enabled'.

- * @param {string} category

* @param {string} setting

* @return {boolean}

* @private

- computeIsSettingEnabled: function(category, setting) {

- // FullScreen is Allow vs. Ask.

- return category == settings.ContentSettingsTypes.FULLSCREEN ?

- setting != settings.PermissionValues.ASK :

- setting != settings.PermissionValues.BLOCK;

+ computeIsSettingEnabled: function(setting) {

+ return setting != settings.PermissionValues.BLOCK;

/**