Skip to content

GitLab

T
tangled
Commit b793d981 authored by Francois Beaufort's avatar Francois Beaufort Committed by Chromium LUCI CQ
Browse files
Options

[WebNFC] Remove TODO comment 

This CL has no functional changes. It adds a manual web platform test
case which navigates a second after requesting NFC permission.

Bug: 1034607
Change-Id: I1174c4d53f192b5b8ff4639d360a39e9170212cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2607885Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#841162}
parent 394d50ef
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 1 deletion
chrome/browser/nfc/nfc_permission_context_android.cc
View file @ b793d981
...@@ -57,7 +57,6 @@ void NfcPermissionContextAndroid::NotifyPermissionSet( ...@@ -57,7 +57,6 @@ void NfcPermissionContextAndroid::NotifyPermissionSet(
return; return;
} }
// TODO(crbug.com/1034607): Close prompt when there is a navigation in a tab
nfc_system_level_setting_->PromptToEnableNfcSystemLevelSetting( nfc_system_level_setting_->PromptToEnableNfcSystemLevelSetting(
web_contents, web_contents,
base::BindOnce( base::BindOnce(
......
third_party/blink/web_tests/NeverFixTests
View file @ b793d981
...@@ -1862,6 +1862,7 @@ external/wpt/visual-viewport/viewport-scroll-event-manual.html [ Skip ] ...@@ -1862,6 +1862,7 @@ external/wpt/visual-viewport/viewport-scroll-event-manual.html [ Skip ]
external/wpt/visual-viewport/viewport-url-bar-changes-height-manual.html [ Skip ] external/wpt/visual-viewport/viewport-url-bar-changes-height-manual.html [ Skip ]
external/wpt/web-nfc/NDEFReader-read-document-hidden-manual.https.html [ Skip ] external/wpt/web-nfc/NDEFReader-read-document-hidden-manual.https.html [ Skip ]
external/wpt/web-nfc/NDEFReader-write-document-hidden-manual.https.html [ Skip ] external/wpt/web-nfc/NDEFReader-write-document-hidden-manual.https.html [ Skip ]
external/wpt/web-nfc/nfc-prompt-manual.https.html [ Skip ]
external/wpt/screen-wake-lock/wakelock-document-hidden-manual.https.html [ Skip ] external/wpt/screen-wake-lock/wakelock-document-hidden-manual.https.html [ Skip ]
external/wpt/web-share/share-cancel-manual.https.html [ Skip ] external/wpt/web-share/share-cancel-manual.https.html [ Skip ]
external/wpt/web-share/share-extra-argument-manual.https.html [ Skip ] external/wpt/web-share/share-extra-argument-manual.https.html [ Skip ]
......
third_party/blink/web_tests/external/wpt/web-nfc/nfc-prompt-manual.https.html 0 → 100644
View file @ b793d981
<!DOCTYPE html>
<meta charset=utf-8>
<title>Web NFC: prompt closes when page reloads</title>
<link rel="help" href="https://w3c.github.io/web-nfc/"/>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<p>
This manual test checks that Web NFC prompt closes when page reloads.
</p>
<ol>
<li>Make sure NFC is disabled at system level</li>
<li>Click button to open Web NFC prompt</li>
<li>Accept first Web NFC prompt if needed</li>
<li>Wait 3 seconds when prompted about turning on the NFC adapter on the system level</li>
<li>Page reloads, click button if Web NFC prompt closed</li>
</ol>
<script>
promise_test(async (t) => {
if (window.location.search === "?didPromptClose") {
const button = document.createElement("button");
button.textContent = "Did Web NFC prompt close?";
await new Promise((resolve) => {
button.onclick = () => {
document.body.removeChild(button);
resolve();
};
document.body.appendChild(button);
});
return;
}
const button = document.createElement("button");
button.textContent = "Click to open Web NFC prompt";
await new Promise((resolve) => {
button.onclick = () => {
document.body.removeChild(button);
resolve();
};
document.body.appendChild(button);
});
// Web NFC prompt shows up.
const ndef = new NDEFReader();
ndef.scan();
// Wait 3 seconds to give time to user to accept first Web NFC prompt.
await new Promise((resolve) => setTimeout(resolve, 3000));
// Reload page and manually check that Web NFC prompt closes.
window.location.search = "?didPromptClose";
}, "Web NFC prompt should close when page reloads.");
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment