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

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

Issue 902223002: Plugin Power Saver: Remove ASK (left C2P). Replace with DETECT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 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;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 var optionAllow = cr.doc.createElement('option'); 66 var optionAllow = cr.doc.createElement('option');
67 optionAllow.textContent = loadTimeData.getString('allowException'); 67 optionAllow.textContent = loadTimeData.getString('allowException');
68 optionAllow.value = 'allow'; 68 optionAllow.value = 'allow';
69 select.appendChild(optionAllow); 69 select.appendChild(optionAllow);
70 70
71 if (this.contentType == 'plugins') { 71 if (this.contentType == 'plugins') {
72 var optionDetect = cr.doc.createElement('option'); 72 var optionDetect = cr.doc.createElement('option');
73 optionDetect.textContent = loadTimeData.getString('detectException'); 73 optionDetect.textContent = loadTimeData.getString('detectException');
74 optionDetect.value = 'detect'; 74 optionDetect.value = 'detect';
75 select.appendChild(optionDetect); 75 select.appendChild(optionDetect);
76 var optionAsk = cr.doc.createElement('option');
77 optionAsk.textContent = loadTimeData.getString('askException');
78 optionAsk.value = 'ask';
79 select.appendChild(optionAsk);
80 } 76 }
81 77
82 if (this.contentType == 'cookies') { 78 if (this.contentType == 'cookies') {
83 var optionSession = cr.doc.createElement('option'); 79 var optionSession = cr.doc.createElement('option');
84 optionSession.textContent = loadTimeData.getString('sessionException'); 80 optionSession.textContent = loadTimeData.getString('sessionException');
85 optionSession.value = 'session'; 81 optionSession.value = 'session';
86 select.appendChild(optionSession); 82 select.appendChild(optionSession);
87 } 83 }
88 84
89 if (this.contentType != 'fullscreen') { 85 if (this.contentType != 'fullscreen') {
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 } 669 }
674 }; 670 };
675 671
676 return { 672 return {
677 ExceptionsListItem: ExceptionsListItem, 673 ExceptionsListItem: ExceptionsListItem,
678 ExceptionsAddRowListItem: ExceptionsAddRowListItem, 674 ExceptionsAddRowListItem: ExceptionsAddRowListItem,
679 ExceptionsList: ExceptionsList, 675 ExceptionsList: ExceptionsList,
680 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, 676 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
681 }; 677 };
682 }); 678 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698