chrome/browser/resources/settings/site_settings/site_details_permission.js - Issue 1882793002: Site Settings: Use only string values for permissions on the JS side.

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_details_permission.js

Issue 1882793002: Site Settings: Use only string values for permissions on the JS side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test Created 4 years, 8 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_details_permission.html ('k') | chrome/browser/resources/settings/site_settings/site_list.js » ('j') | chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index eee4810b9d90676b33318b9ff863a7f33cb4b83b..552ad5b5f90c2fa8b763f8be966c5c770fef819b 100644

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

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

@@ -35,7 +35,7 @@ Polymer({

/** @override */

attached: function() {

- this.PermissionStringValues = settings.PermissionStringValues;

+ this.PermissionValues = settings.PermissionValues;

this.addWebUIListener('contentSettingSitePermissionChanged',

this.sitePermissionChanged_.bind(this));

@@ -88,19 +88,11 @@ Polymer({

/**

* Handles the category permission changing for this origin.

- * @param {!{detail: !{item: !{innerText: string}}}} event

+ * @param {!{detail: !{item: !{dataset: !{permissionValue: string}}}}} event

onPermissionMenuIronActivate_: function(event) {

- var action = event.detail.item.dataset.permissionValue;

- var value = '';

- if (action == settings.PermissionStringValues.ALLOW)

- value = settings.PermissionValues.ALLOW;

- else if (action == settings.PermissionStringValues.BLOCK)

- value = settings.PermissionValues.BLOCK;

- else

- assertNotReached('Invalid menu item ' + action);

+ var value = event.detail.item.dataset.permissionValue;

this.setCategoryPermissionForOrigin(

- this.site.origin, '', value, this.category);

+ this.site.origin, '', this.category, value);

michaelpg 2016/04/13 16:40:16 why are these switched

Finnur 2016/04/13 18:05:47 You'll find the answer in site_settings_behavior.j

});