chrome/browser/resources/settings/site_settings/site_details_permission.js - Issue 2298283002: Site Settings Desktop: Support adding exceptions for incognito mode.

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 2298283002: Site Settings Desktop: Support adding exceptions for incognito mode. (Closed)

Patch Set: Fix test Created 4 years, 3 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/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/site_settings/site_list.html » ('j') | no next file with comments »
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 649465677a6c63e9d3506fa589460be0cc52d41b..eb7e48b8df0e6bd22f7fead3c929186f86960601 100644

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

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

@@ -86,8 +86,9 @@ Polymer({

* Resets the category permission for this origin.

resetPermission: function() {

- this.resetCategoryPermissionForOrigin(

- this.site.origin, this.site.embeddingOrigin, this.category);

+ this.browserProxy.resetCategoryPermissionForOrigin(

+ this.site.origin, this.site.embeddingOrigin, this.category,

+ this.site.incognito);

this.$.details.hidden = true;

@@ -97,7 +98,8 @@ Polymer({

onPermissionMenuIronActivate_: function(event) {

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

- this.setCategoryPermissionForOrigin(

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

+ this.browserProxy.setCategoryPermissionForOrigin(

+ this.site.origin, this.site.embeddingOrigin, this.category, value,

+ this.site.incognito);

});