Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 /** | 5 /** |
| 6 * @fileoverview Behavior common to Site Settings classes. | 6 * @fileoverview Behavior common to Site Settings classes. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 /** @polymerBehavior */ | 9 /** @polymerBehavior */ |
| 10 var SiteSettingsBehaviorImpl = { | 10 var SiteSettingsBehaviorImpl = { |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 * @type {settings.SiteSettingsPrefsBrowserProxyImpl} | 21 * @type {settings.SiteSettingsPrefsBrowserProxyImpl} |
| 22 */ | 22 */ |
| 23 browserProxy: Object, | 23 browserProxy: Object, |
| 24 }, | 24 }, |
| 25 | 25 |
| 26 created: function() { | 26 created: function() { |
| 27 this.browserProxy = | 27 this.browserProxy = |
| 28 settings.SiteSettingsPrefsBrowserProxyImpl.getInstance(); | 28 settings.SiteSettingsPrefsBrowserProxyImpl.getInstance(); |
| 29 }, | 29 }, |
| 30 | 30 |
| 31 attached: function() { | |
| 32 this.PermissionValues = settings.PermissionValues; | |
|
michaelpg
2016/06/13 15:54:38
Why attached instead of ready? (I would be worried
Finnur
2016/06/16 13:53:10
When I implemented this initially, something didn'
| |
| 33 }, | |
| 34 | |
| 31 /** | 35 /** |
| 32 * Re-sets the category permission for a given origin. | 36 * Re-sets the category permission for a given origin. |
| 33 * @param {string} primaryPattern The primary pattern to reset the permission | 37 * @param {string} primaryPattern The primary pattern to reset the permission |
| 34 * for. | 38 * for. |
| 35 * @param {string} secondaryPattern The secondary pattern to reset the | 39 * @param {string} secondaryPattern The secondary pattern to reset the |
| 36 * permission for. | 40 * permission for. |
| 37 * @param {string} category The category permission to change. | 41 * @param {string} category The category permission to change. |
| 38 * @protected | 42 * @protected |
| 39 */ | 43 */ |
| 40 resetCategoryPermissionForOrigin: function( | 44 resetCategoryPermissionForOrigin: function( |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 363 * @private | 367 * @private |
| 364 */ | 368 */ |
| 365 computeSiteIcon: function(site) { | 369 computeSiteIcon: function(site) { |
| 366 var url = this.ensureUrlHasScheme(site.originForDisplay); | 370 var url = this.ensureUrlHasScheme(site.originForDisplay); |
| 367 return 'background-image: ' + cr.icon.getFaviconImageSet(url); | 371 return 'background-image: ' + cr.icon.getFaviconImageSet(url); |
| 368 }, | 372 }, |
| 369 }; | 373 }; |
| 370 | 374 |
| 371 /** @polymerBehavior */ | 375 /** @polymerBehavior */ |
| 372 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl]; | 376 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl]; |
| OLD | NEW |