Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Unified Diff: chrome/browser/resources/settings/site_settings/site_list.js

Issue 2699013002: MD Settings: Allow editing a cookie site exception. (Closed)
Patch Set: Address nits. Created 3 years, 10 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
Index: chrome/browser/resources/settings/site_settings/site_list.js
diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js
index 319f04bb582059268282d6dfda76b3dd03673bfe..ed7a2b3747cc90c0ec4fde6b4737080f29ed49c3 100644
--- a/chrome/browser/resources/settings/site_settings/site_list.js
+++ b/chrome/browser/resources/settings/site_settings/site_list.js
@@ -41,6 +41,12 @@ Polymer({
actionMenuSite_: Object,
/**
+ * Whether the "edit exception" dialog should be shown.
+ * @private
+ */
+ showEditExceptionDialog_: Boolean,
+
+ /**
* Array of sites to display in the widget.
* @type {!Array<SiteException>}
*/
@@ -69,23 +75,33 @@ Polymer({
/**
* Whether to show the Allow action in the action menu.
+ * @private
*/
showAllowAction_: Boolean,
/**
* Whether to show the Block action in the action menu.
+ * @private
*/
showBlockAction_: Boolean,
/**
* Whether to show the 'Clear on exit' action in the action
* menu.
+ * @private
*/
showSessionOnlyAction_: Boolean,
/**
+ * Whether to show the 'edit' action in the action menu.
+ * @private
+ */
+ showEditAction_: Boolean,
+
+ /**
* Keeps track of the incognito status of the current profile (whether one
* exists).
+ * @private
*/
incognitoProfileActive_: {
type: Boolean,
@@ -94,6 +110,7 @@ Polymer({
/**
* All possible actions in the action menu.
+ * @private
*/
actions_: {
readOnly: true,
@@ -362,6 +379,8 @@ Polymer({
this.showSessionOnlyAction_ =
this.categorySubtype != settings.PermissionValues.SESSION_ONLY &&
this.category == settings.ContentSettingsTypes.COOKIES;
+ this.showEditAction_ =
+ this.category == settings.ContentSettingsTypes.COOKIES;
},
/**
@@ -429,6 +448,19 @@ Polymer({
},
/** @private */
+ onEditTap_: function() {
+ this.showEditExceptionDialog_ = true;
+ },
+
+ /** @private */
+ onEditExceptionDialogClosed_: function() {
+ this.showEditExceptionDialog_ = false;
+ // Close action menu after dialog has been closed, otherwise
+ // |actionMenuSite_| is reset while the dialog is still accessing it.
+ this.closeActionMenu_();
+ },
+
+ /** @private */
onResetTap_: function() {
this.onActionMenuActivate_(settings.PermissionValues.DEFAULT);
this.closeActionMenu_();

Powered by Google App Engine
This is Rietveld 408576698