chrome/browser/resources/settings/site_settings_page/site_settings_page.js - Issue 2282603002: [HBD] Update MD SiteSettingsHandler to support 3 modes.

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_page/site_settings_page.js

Issue 2282603002: [HBD] Update MD SiteSettingsHandler to support 3 modes. (Closed)

Patch Set: Created 4 years, 4 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

« no previous file with comments | « chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js ('k') | chrome/browser/ui/webui/settings/site_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings_page/site_settings_page.js

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

index a9e9ada1ac1f3464e3c6aa9cd1364782c83126bb..127e03fc02e18afa7ed6c37ac54eba790a161619 100644

--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js

+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js

@@ -52,7 +52,11 @@ Polymer({

setDefaultValue_: function(category, id) {

this.browserProxy.getDefaultValueForContentType(

- category).then(function(enabled) {

+ category).then(function(setting) {

+ // FullScreen is Allow vs. Ask.

+ var enabled = category == settings.ContentSettingsTypes.FULLSCREEN ?

+ setting != settings.PermissionValues.ASK :

+ setting != settings.PermissionValues.BLOCK;

Finnur 2016/08/26 11:11:44 Please move this into a helper function in SiteSet

tommycli 2016/08/26 16:52:16 Done.

var description = this.computeCategoryDesc(category, enabled, false);

this.$$(id).innerText = description;

}.bind(this));