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

Unified Diff: chrome/browser/resources/options/content_settings_exceptions_area.js

Issue 1962163002: Revert of [Chrome Settings UI] If User Exceptions are not allowed, prevent editing / viewing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/options/content_settings_exceptions_area.js
diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js
index ed1bad6f7033c2d972b0033d2a25cd30b7c9a40b..3ad7ac62a552f0e1079168e4d2c97cf12e4e61c1 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.js
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.js
@@ -478,12 +478,6 @@
__proto__: InlineEditableItemList.prototype,
/**
- * True if user may set preference exceptions.
- * @private {boolean}
- */
- allowEdit_: true,
-
- /**
* Called when an element is decorated as a list.
*/
decorate: function() {
@@ -526,40 +520,6 @@
},
/**
- * Updates visibility of each row, depending on content.
- */
- updateRowVisibility: function() {
- // Rows with user exceptions are visible iff this.isEditable().
- // All other rows are visible.
- var isEditable = this.isEditable();
- for (var index = 0; index < this.dataModel.length; ++index) {
- var item = this.getListItemByIndex(index);
- if (item.dataItem.source == 'preference')
- item.hidden = !isEditable;
- }
- },
-
- /**
- * Sets whether user is allowed to set preference exceptions. Updates UI.
- *
- * @param {boolean} allowEdit New value for this.allowEdit_.
- */
- setAllowEdit: function(allowEdit) {
- var oldIsEditable = this.isEditable();
- this.allowEdit_ = allowEdit;
- var newIsEditable = this.isEditable();
-
- // If visibility changed, add or remove the Add New Exception row.
- if (oldIsEditable != newIsEditable) {
- if (newIsEditable)
- this.dataModel.push(null);
- else
- this.dataModel.pop();
- this.updateRowVisibility();
- }
- },
-
- /**
* Sets the exceptions in the js model.
*
* @param {Array<options.Exception>} entries A list of dictionaries of
@@ -576,7 +536,6 @@
var args = [0, deleteCount];
args.push.apply(args, entries);
this.dataModel.splice.apply(this.dataModel, args);
- this.updateRowVisibility();
},
/**
@@ -603,14 +562,14 @@
* Returns whether the rows are editable in this list.
*/
isEditable: function() {
- return this.allowEdit_ && isEditableType(this.contentType);
+ // Exceptions of the following lists are not editable for now.
+ return isEditableType(this.contentType);
},
/**
* Removes all exceptions from the js model.
*/
reset: function() {
- this.allowEdit_ = true;
if (this.isEditable()) {
// The null creates the Add New Exception row.
this.dataModel = new ArrayDataModel([null]);
« no previous file with comments | « chrome/browser/resources/options/content_settings.js ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698