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

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

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.html
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index 30ce4b1bfa6b9fd9d6049e14e5f8673ca7a37794..0636f273d99b1e171e3dd450f92fc70a88433954 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -22,8 +22,6 @@
<if expr="chromeos">
<link rel="import" href="change_picture.html">
-<link rel="import" href="easy_unlock_browser_proxy.html">
-<link rel="import" href="easy_unlock_turn_off_dialog.html">
<link rel="import" href="fingerprint_list.html">
<link rel="import" href="lock_screen.html">
<link rel="import" href="lock_state_behavior.html">
@@ -72,11 +70,6 @@
color: var(--settings-error-color);
}
- #easy-unlock .start {
- /* Use padding to ensure taller content looks correct. */
- padding: 11px 0;
- }
-
.icon-container {
display: flex;
flex-shrink: 0;
@@ -218,50 +211,6 @@
aria-describedby="lockScrenSecondary"></button>
</div>
</template>
-
- <template is="dom-if" if="[[easyUnlockAllowed_]]">
- <div id="easy-unlock" class="settings-box two-line">
- <div class="start">
- <div>$i18n{easyUnlockSectionTitle}</div>
- <div class="secondary">
- <template is="dom-if" if="[[!easyUnlockEnabled_]]">
- $i18n{easyUnlockSetupIntro}
- </template>
- <template is="dom-if" if="[[easyUnlockEnabled_]]">
- $i18n{easyUnlockDescription}
- </template>
- <a target="_blank" href="$i18n{easyUnlockLearnMoreURL}">
- $i18n{learnMore}
- </a>
- <!-- TODO(dbeam): this should be 1 dom-if with a method instead
- of 2 nested dom-ifs. -->
- <template is="dom-if" if="[[easyUnlockEnabled_]]">
- <template is="dom-if"
- if="[[easyUnlockProximityDetectionAllowed_]]">
- <settings-toggle-button
- pref="{{prefs.easy_unlock.proximity_required}}"
- label="$i18n{easyUnlockRequireProximityLabel}">
- </settings-toggle-button>
- </template>
- </template>
- </div>
- </div>
- <div class="secondary-action">
- <template is="dom-if" if="[[!easyUnlockEnabled_]]">
- <paper-button id="easyUnlockSetup" class="secondary-button"
- on-tap="onEasyUnlockSetupTap_">
- $i18n{easyUnlockSetupButton}
- </paper-button>
- </template>
- <template is="dom-if" if="[[easyUnlockEnabled_]]">
- <paper-button id="easyUnlockTurnOff" class="secondary-button"
- on-tap="onEasyUnlockTurnOffTap_">
- $i18n{easyUnlockTurnOffButton}
- </paper-button>
- </template>
- </div>
- </div>
- </template>
</if>
<div id="manage-other-people-subpage-trigger"
@@ -395,13 +344,6 @@
</settings-import-data-dialog>
</template>
-<if expr="chromeos">
- <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
- <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
- on-close="onEasyUnlockTurnOffDialogClose_">
- </easy-unlock-turn-off-dialog>
- </template>
-</if>
</template>
<script src="people_page.js"></script>
</dom-module>

Powered by Google App Engine
This is Rietveld 408576698