chrome/browser/resources/settings/site_settings/site_settings_category.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_category.js

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)

Patch Set: Fix more things. 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/resources/settings/site_settings/site_settings_behavior.js ('k') | chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm » ('j') | components/content_settings/core/browser/content_settings_pref_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dc96422163c7d2238082e5f127cf354e08abb80b..63cc5ace2c53df64ad00e0278f10d3d4eb37921d 100644

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

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

@@ -140,8 +140,7 @@ Polymer({

settings.SiteSettingsPrefsBrowserProxyImpl.getInstance()

.getDefaultValueForContentType(

this.category).then(function(setting) {

- this.categoryEnabled =

- this.computeIsSettingEnabled(this.category, setting);

+ this.categoryEnabled = this.computeIsSettingEnabled(setting);

// Flash only shows ALLOW or BLOCK descriptions on the slider.

var sliderSetting = setting;