Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2738)

Unified Diff: chrome/browser/resources/settings/people_page/people_page.js

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)
Patch Set: Closure. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/people_page/people_page.js
diff --git a/chrome/browser/resources/settings/people_page/people_page.js b/chrome/browser/resources/settings/people_page/people_page.js
index c53125e22c6338ccee18e2474c35fc4faee8f7f0..91f4adf74b54e92005c119ccf1e41e54d4c93215 100644
--- a/chrome/browser/resources/settings/people_page/people_page.js
+++ b/chrome/browser/resources/settings/people_page/people_page.js
@@ -97,53 +97,6 @@ Polymer({
},
readOnly: true,
},
-
- /** @private {!settings.EasyUnlockBrowserProxy} */
- easyUnlockBrowserProxy_: {
- type: Object,
- value: function() {
- return settings.EasyUnlockBrowserProxyImpl.getInstance();
- },
- },
-
- /**
- * True if Easy Unlock is allowed on this machine.
- */
- easyUnlockAllowed_: {
- type: Boolean,
- value: function() {
- return loadTimeData.getBoolean('easyUnlockAllowed');
- },
- readOnly: true,
- },
-
- /**
- * True if Easy Unlock is enabled.
- */
- easyUnlockEnabled_: {
- type: Boolean,
- value: function() {
- return loadTimeData.getBoolean('easyUnlockEnabled');
- },
- },
-
- /**
- * True if Easy Unlock's proximity detection feature is allowed.
- */
- easyUnlockProximityDetectionAllowed_: {
- type: Boolean,
- value: function() {
- return loadTimeData.getBoolean('easyUnlockAllowed') &&
- loadTimeData.getBoolean('easyUnlockProximityDetectionAllowed');
- },
- readOnly: true,
- },
-
- /** @private */
- showEasyUnlockTurnOffDialog_: {
- type: Boolean,
- value: false,
- },
// </if>
},
@@ -166,16 +119,6 @@ Polymer({
this.handleSyncStatus_.bind(this));
this.addWebUIListener('sync-status-changed',
this.handleSyncStatus_.bind(this));
-
-// <if expr="chromeos">
- if (this.easyUnlockAllowed_) {
- this.addWebUIListener(
- 'easy-unlock-enabled-status',
- this.handleEasyUnlockEnabledStatusChanged_.bind(this));
- this.easyUnlockBrowserProxy_.getEnabledStatus().then(
- this.handleEasyUnlockEnabledStatusChanged_.bind(this));
- }
-// </if>
},
/** @protected */
@@ -266,18 +209,6 @@ Polymer({
this.syncStatus = syncStatus;
},
-// <if expr="chromeos">
- /**
- * Handler for when the Easy Unlock enabled status has changed.
- * @private
- */
- handleEasyUnlockEnabledStatusChanged_: function(easyUnlockEnabled) {
- this.easyUnlockEnabled_ = easyUnlockEnabled;
- this.showEasyUnlockTurnOffDialog_ =
- easyUnlockEnabled && this.showEasyUnlockTurnOffDialog_;
- },
-// </if>
-
/** @private */
onPictureTap_: function() {
// <if expr="chromeos">
@@ -378,25 +309,6 @@ Polymer({
onConfigureLockTap_: function() {
settings.navigateTo(settings.Route.LOCK_SCREEN);
},
-
- /** @private */
- onEasyUnlockSetupTap_: function() {
- this.easyUnlockBrowserProxy_.startTurnOnFlow();
- },
-
- /**
- * @param {!Event} e
- * @private
- */
- onEasyUnlockTurnOffTap_: function(e) {
- e.preventDefault();
- this.showEasyUnlockTurnOffDialog_ = true;
- },
-
- /** @private */
- onEasyUnlockTurnOffDialogClose_: function() {
- this.showEasyUnlockTurnOffDialog_ = false;
- },
// </if>
/** @private */
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_page.html ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698