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

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

Issue 10536103: Revert 141482 - Pepper Flash settings integration - camera and microphone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 | Annotate | Revision Log
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 InlineEditableItemList = options.InlineEditableItemList; 6 /** @const */ var InlineEditableItemList = options.InlineEditableItemList;
7 /** @const */ var InlineEditableItem = options.InlineEditableItem; 7 /** @const */ var InlineEditableItem = options.InlineEditableItem;
8 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; 8 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
9 9
10 /** 10 /**
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 this.contentType = parentNode.getAttribute('contentType'); 368 this.contentType = parentNode.getAttribute('contentType');
369 break; 369 break;
370 } 370 }
371 } 371 }
372 372
373 this.mode = this.getAttribute('mode'); 373 this.mode = this.getAttribute('mode');
374 374
375 var exceptionList = this; 375 var exceptionList = this;
376 376
377 // Whether the exceptions in this list allow an 'Ask every time' option. 377 // Whether the exceptions in this list allow an 'Ask every time' option.
378 this.enableAskOption = this.contentType == 'plugins' || 378 this.enableAskOption = this.contentType == 'plugins';
379 this.contentType == 'pepper-flash-cameramic';
380 379
381 this.autoExpands = true; 380 this.autoExpands = true;
382 this.reset(); 381 this.reset();
383 }, 382 },
384 383
385 /** 384 /**
386 * Creates an item to go in the list. 385 * Creates an item to go in the list.
387 * @param {Object} entry The element from the data model for this row. 386 * @param {Object} entry The element from the data model for this row.
388 */ 387 */
389 createItem: function(entry) { 388 createItem: function(entry) {
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 } 559 }
561 }; 560 };
562 561
563 return { 562 return {
564 ExceptionsListItem: ExceptionsListItem, 563 ExceptionsListItem: ExceptionsListItem,
565 ExceptionsAddRowListItem: ExceptionsAddRowListItem, 564 ExceptionsAddRowListItem: ExceptionsAddRowListItem,
566 ExceptionsList: ExceptionsList, 565 ExceptionsList: ExceptionsList,
567 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, 566 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
568 }; 567 };
569 }); 568 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698