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

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

Issue 10479015: Pepper Flash settings integration - camera and microphone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & resolve conflicts 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 this.contentType = parentNode.getAttribute('contentType'); 355 this.contentType = parentNode.getAttribute('contentType');
356 break; 356 break;
357 } 357 }
358 } 358 }
359 359
360 this.mode = this.getAttribute('mode'); 360 this.mode = this.getAttribute('mode');
361 361
362 var exceptionList = this; 362 var exceptionList = this;
363 363
364 // Whether the exceptions in this list allow an 'Ask every time' option. 364 // Whether the exceptions in this list allow an 'Ask every time' option.
365 this.enableAskOption = this.contentType == 'plugins'; 365 this.enableAskOption = this.contentType == 'plugins' ||
366 this.contentType == 'pepper_flash_cameramic';
366 367
367 this.autoExpands = true; 368 this.autoExpands = true;
368 this.reset(); 369 this.reset();
369 }, 370 },
370 371
371 /** 372 /**
372 * Creates an item to go in the list. 373 * Creates an item to go in the list.
373 * @param {Object} entry The element from the data model for this row. 374 * @param {Object} entry The element from the data model for this row.
374 */ 375 */
375 createItem: function(entry) { 376 createItem: function(entry) {
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 } 547 }
547 }; 548 };
548 549
549 return { 550 return {
550 ExceptionsListItem: ExceptionsListItem, 551 ExceptionsListItem: ExceptionsListItem,
551 ExceptionsAddRowListItem: ExceptionsAddRowListItem, 552 ExceptionsAddRowListItem: ExceptionsAddRowListItem,
552 ExceptionsList: ExceptionsList, 553 ExceptionsList: ExceptionsList,
553 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, 554 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
554 }; 555 };
555 }); 556 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698