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

Side by Side Diff: chrome/browser/resources/options/content_settings_exceptions_area.js

Issue 2441843003: Remove fullscreen and mouselock content settings UI. (Closed)
Patch Set: Moved fullscreen / mouselock check earlier. Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('options.contentSettings', function() { 5 cr.define('options.contentSettings', function() {
6 /** @const */ var ControlledSettingIndicator = 6 /** @const */ var ControlledSettingIndicator =
7 options.ControlledSettingIndicator; 7 options.ControlledSettingIndicator;
8 /** @const */ var InlineEditableItemList = options.InlineEditableItemList; 8 /** @const */ var InlineEditableItemList = options.InlineEditableItemList;
9 /** @const */ var InlineEditableItem = options.InlineEditableItem; 9 /** @const */ var InlineEditableItem = options.InlineEditableItem;
10 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; 10 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
11 11
12 /** 12 /**
13 * Returns whether exceptions list for the type is editable. 13 * Returns whether exceptions list for the type is editable.
14 * 14 *
15 * @param {string} contentType The type of the list. 15 * @param {string} contentType The type of the list.
16 */ 16 */
17 function isEditableType(contentType) { 17 function isEditableType(contentType) {
18 // Exceptions of the following lists are not editable for now. 18 // Exceptions of the following lists are not editable for now.
19 return !(contentType == 'location' || 19 return !(contentType == 'location' ||
20 contentType == 'fullscreen' ||
21 contentType == 'media-stream-mic' || 20 contentType == 'media-stream-mic' ||
22 contentType == 'media-stream-camera' || 21 contentType == 'media-stream-camera' ||
23 contentType == 'midi-sysex' || 22 contentType == 'midi-sysex' ||
24 contentType == 'zoomlevels' || 23 contentType == 'zoomlevels' ||
25 isChosenObjectType(contentType)); 24 isChosenObjectType(contentType));
26 } 25 }
27 26
28 /** 27 /**
29 * Returns whether exceptions of this type represent chosen objects. 28 * Returns whether exceptions of this type represent chosen objects.
30 * 29 *
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 select.appendChild(optionDetect); 110 select.appendChild(optionDetect);
112 } 111 }
113 112
114 if (this.contentType == 'cookies') { 113 if (this.contentType == 'cookies') {
115 var optionSession = cr.doc.createElement('option'); 114 var optionSession = cr.doc.createElement('option');
116 optionSession.textContent = loadTimeData.getString('sessionException'); 115 optionSession.textContent = loadTimeData.getString('sessionException');
117 optionSession.value = 'session_only'; 116 optionSession.value = 'session_only';
118 select.appendChild(optionSession); 117 select.appendChild(optionSession);
119 } 118 }
120 119
121 if (this.contentType != 'fullscreen') { 120 var optionBlock = cr.doc.createElement('option');
122 var optionBlock = cr.doc.createElement('option'); 121 optionBlock.textContent = loadTimeData.getString('blockException');
123 optionBlock.textContent = loadTimeData.getString('blockException'); 122 optionBlock.value = 'block';
124 optionBlock.value = 'block'; 123 select.appendChild(optionBlock);
125 select.appendChild(optionBlock);
126 }
127 124
128 if (this.isEmbeddingRule()) { 125 if (this.isEmbeddingRule()) {
129 this.patternLabel.classList.add('sublabel'); 126 this.patternLabel.classList.add('sublabel');
130 this.editable = false; 127 this.editable = false;
131 } 128 }
132 129
133 if (this.setting == 'default') { 130 if (this.setting == 'default') {
134 // Items that don't have their own settings (parents of 'embedded on' 131 // Items that don't have their own settings (parents of 'embedded on'
135 // items) aren't deletable. 132 // items) aren't deletable.
136 this.deletable = false; 133 this.deletable = false;
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 } 725 }
729 }; 726 };
730 727
731 return { 728 return {
732 ExceptionsListItem: ExceptionsListItem, 729 ExceptionsListItem: ExceptionsListItem,
733 ExceptionsAddRowListItem: ExceptionsAddRowListItem, 730 ExceptionsAddRowListItem: ExceptionsAddRowListItem,
734 ExceptionsList: ExceptionsList, 731 ExceptionsList: ExceptionsList,
735 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, 732 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
736 }; 733 };
737 }); 734 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698