Add quick unlock Settings in options page

chrome/browser/resources/settings/people_page/lock_screen.js

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: {
+      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');
       settings.navigateTo(settings.Route.PEOPLE);
+    }
   },
 
   /** @private */