| 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 // site settings, that filtering would happen here. If that doesn't happen | 433 // site settings, that filtering would happen here. If that doesn't happen |
| 434 // then originForDisplay should be removed (it's redundant with origin). | 434 // then originForDisplay should be removed (it's redundant with origin). |
| 435 // e.g. var originForDisplay = someFilter(origin); | 435 // e.g. var originForDisplay = someFilter(origin); |
| 436 | 436 |
| 437 var embeddingOrigin = exception.embeddingOrigin; | 437 var embeddingOrigin = exception.embeddingOrigin; |
| 438 var embeddingOriginForDisplay = ''; | 438 var embeddingOriginForDisplay = ''; |
| 439 if (origin != embeddingOrigin) { | 439 if (origin != embeddingOrigin) { |
| 440 embeddingOriginForDisplay = | 440 embeddingOriginForDisplay = |
| 441 this.getEmbedderString(embeddingOrigin, this.category); | 441 this.getEmbedderString(embeddingOrigin, this.category); |
| 442 } | 442 } |
| 443 var originForDisplay = origin; |
| 444 if (exception.displayName) { |
| 445 originForDisplay = exception.displayName; |
| 446 } |
| 443 | 447 |
| 444 return { | 448 return { |
| 445 origin: origin, | 449 origin: origin, |
| 446 originForDisplay: origin, | 450 originForDisplay: originForDisplay, |
| 447 embeddingOrigin: embeddingOrigin, | 451 embeddingOrigin: embeddingOrigin, |
| 448 embeddingOriginForDisplay: embeddingOriginForDisplay, | 452 embeddingOriginForDisplay: embeddingOriginForDisplay, |
| 449 incognito: exception.incognito, | 453 incognito: exception.incognito, |
| 450 setting: exception.setting, | 454 setting: exception.setting, |
| 451 source: exception.source, | 455 source: exception.source, |
| 452 }; | 456 }; |
| 453 }, | 457 }, |
| 454 | 458 |
| 455 }; | 459 }; |
| 456 | 460 |
| 457 /** @polymerBehavior */ | 461 /** @polymerBehavior */ |
| 458 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl]; | 462 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl]; |
| OLD | NEW |