chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.js - Issue 2180823004: Migrate <cr-dialog> from PaperDialogBehavior to native <dialog>.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2180823004: Migrate <cr-dialog> from PaperDialogBehavior to native <dialog>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge conflicts with Tommy's CL. Created 4 years, 5 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

« no previous file with comments | « chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.html ('k') | chrome/browser/resources/settings/people_page/people_page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.js

diff --git a/chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.js b/chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.js

index 892a94377314943303513b7dd8b76abae6a6df01..cec540ad8915c5718805090aa7545dd1c4c48949 100644

--- a/chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.js

+++ b/chrome/browser/resources/settings/people_page/easy_unlock_turn_off_dialog.js

@@ -58,7 +58,7 @@ Polymer({

open: function() {

this.getTurnOffStatus_().then(function(status) {

this.status_ = status;

- this.$.dialog.open();

+ this.$.dialog.showModal();

}.bind(this));

// The turn off flow status listener should only be active when the dialog

@@ -87,8 +87,8 @@ Polymer({

* @private

handleEasyUnlockEnabledStatusChanged_: function(easyUnlockEnabled) {

- var dialog = /** @type {{opened: boolean}} */ this.$.dialog;

- if (!easyUnlockEnabled && dialog.opened)

+ var dialog = /** @type {!CrDialogElement} */ this.$.dialog;

+ if (!easyUnlockEnabled && dialog.open)

this.onCancelTap_();