| OLD | NEW |
| 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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 | 651 |
| 652 $('exception-behavior-column').hidden = type == 'zoomlevels'; | 652 $('exception-behavior-column').hidden = type == 'zoomlevels'; |
| 653 $('exception-zoom-column').hidden = type != 'zoomlevels'; | 653 $('exception-zoom-column').hidden = type != 'zoomlevels'; |
| 654 }, | 654 }, |
| 655 | 655 |
| 656 /** | 656 /** |
| 657 * Called after the page has been shown. Show the content type for the | 657 * Called after the page has been shown. Show the content type for the |
| 658 * location's hash. | 658 * location's hash. |
| 659 */ | 659 */ |
| 660 didShowPage: function() { | 660 didShowPage: function() { |
| 661 var hash = location.hash; | 661 if (this.hash) |
| 662 if (hash) | 662 this.showList(this.hash.slice(1)); |
| 663 this.showList(hash.slice(1)); | |
| 664 }, | 663 }, |
| 665 }; | 664 }; |
| 666 | 665 |
| 667 /** | 666 /** |
| 668 * Called when the last incognito window is closed. | 667 * Called when the last incognito window is closed. |
| 669 */ | 668 */ |
| 670 ContentSettingsExceptionsArea.OTRProfileDestroyed = function() { | 669 ContentSettingsExceptionsArea.OTRProfileDestroyed = function() { |
| 671 this.hideOTRLists(true); | 670 this.hideOTRLists(true); |
| 672 }; | 671 }; |
| 673 | 672 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 685 } | 684 } |
| 686 }; | 685 }; |
| 687 | 686 |
| 688 return { | 687 return { |
| 689 ExceptionsListItem: ExceptionsListItem, | 688 ExceptionsListItem: ExceptionsListItem, |
| 690 ExceptionsAddRowListItem: ExceptionsAddRowListItem, | 689 ExceptionsAddRowListItem: ExceptionsAddRowListItem, |
| 691 ExceptionsList: ExceptionsList, | 690 ExceptionsList: ExceptionsList, |
| 692 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, | 691 ContentSettingsExceptionsArea: ContentSettingsExceptionsArea, |
| 693 }; | 692 }; |
| 694 }); | 693 }); |
| OLD | NEW |