Chromium Code Reviews| Index: chrome/browser/resources/settings/people_page/lock_screen.js |
| diff --git a/chrome/browser/resources/settings/people_page/lock_screen.js b/chrome/browser/resources/settings/people_page/lock_screen.js |
| index f296363be34d22c6969668a110d742ddcf0a9617..44ba038d7ed1f672700ffb7b2a520c77282da5c7 100644 |
| --- a/chrome/browser/resources/settings/people_page/lock_screen.js |
| +++ b/chrome/browser/resources/settings/people_page/lock_screen.js |
| @@ -37,6 +37,17 @@ Polymer({ |
| type: Object, |
| observer: 'onSetModesChanged_' |
| }, |
| + |
| + /** |
| + * Hide enable screenlock settings if coming from options page |
| + * TODO(xiaoyinh@): Remove this property once we don't support options |
| + */ |
| + hideEnableScreenlock: { |
|
tommycli
2016/08/17 21:19:59
Instead of adding this Polymer property here for h
xiaoyinh(OOO Sep 11-29)
2016/08/18 22:41:12
Done.
|
| + type: Boolean, |
| + value: false, |
| + notify: true |
| + }, |
| + |
| }, |
| /** selectedUnlockType is defined in LockStateBehavior. */ |
| @@ -92,8 +103,11 @@ Polymer({ |
| /** @private */ |
| onPasswordClosed_: function() { |
| - if (!this.setModes_) |
| + if (!this.setModes_) { |
| + /**TODO(xiaoyinh@): Remove this event once we don't support options. */ |
| + this.fire('close-overlay'); |
|
tommycli
2016/08/17 21:19:59
Likewise, can the embedding code find the inner se
xiaoyinh(OOO Sep 11-29)
2016/08/18 22:41:12
Done.
|
| settings.navigateTo(settings.Route.PEOPLE); |
| + } |
| }, |
| /** @private */ |