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

Unified Diff: third_party/WebKit/Source/modules/nfc/NFC.h

Issue 2052473002: Revert of [webnfc] Implement push() method in blink nfc module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onionsoup_webnfc
Patch Set: Created 4 years, 6 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 | « third_party/WebKit/Source/modules/nfc/DEPS ('k') | third_party/WebKit/Source/modules/nfc/NFC.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/nfc/NFC.h
diff --git a/third_party/WebKit/Source/modules/nfc/NFC.h b/third_party/WebKit/Source/modules/nfc/NFC.h
index 1c6d4d88da7ffc521f327fca9edb7bab4015c7a7..2b756fc4cb583d4e351110cb1996b8573132c75a 100644
--- a/third_party/WebKit/Source/modules/nfc/NFC.h
+++ b/third_party/WebKit/Source/modules/nfc/NFC.h
@@ -8,39 +8,26 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptWrappable.h"
#include "bindings/modules/v8/StringOrArrayBufferOrNFCMessage.h"
-#include "core/dom/ContextLifecycleObserver.h"
+#include "core/frame/LocalFrameLifecycleObserver.h"
#include "core/page/PageLifecycleObserver.h"
-#include "device/nfc/nfc.mojom-blink.h"
-#include "mojo/public/cpp/bindings/binding.h"
namespace blink {
class MessageCallback;
-class NFCError;
class NFCPushOptions;
using NFCPushMessage = StringOrArrayBufferOrNFCMessage;
class NFCWatchOptions;
-class ServiceRegistry;
class NFC final
- : public GarbageCollectedFinalized<NFC>
+ : public GarbageCollected<NFC>
, public ScriptWrappable
- , public PageLifecycleObserver
- , public ContextLifecycleObserver
- , public device::nfc::blink::NFCClient {
+ , public LocalFrameLifecycleObserver
+ , public PageLifecycleObserver {
DEFINE_WRAPPERTYPEINFO();
USING_GARBAGE_COLLECTED_MIXIN(NFC);
- USING_PRE_FINALIZER(NFC, dispose);
public:
static NFC* create(LocalFrame*);
-
- virtual ~NFC();
-
- void dispose();
-
- // ContextLifecycleObserver overrides.
- void contextDestroyed() override;
// Pushes NFCPushMessage asynchronously to NFC tag / peer.
ScriptPromise push(ScriptState*, const NFCPushMessage&, const NFCPushOptions&);
@@ -57,6 +44,9 @@
// Cancels all watch operations.
ScriptPromise cancelWatch(ScriptState*);
+ // Implementation of LocalFrameLifecycleObserver.
+ void willDetachFrameHost() override;
+
// Implementation of PageLifecycleObserver.
void pageVisibilityChanged() override;
@@ -64,17 +54,7 @@
DECLARE_VIRTUAL_TRACE();
private:
- void OnRequestCompleted(ScriptPromiseResolver*, device::nfc::blink::NFCErrorPtr);
- void OnConnectionError();
-
- // device::nfc::blink::NFCClient implementation.
- void OnWatch(mojo::WTFArray<uint32_t> ids, device::nfc::blink::NFCMessagePtr) override;
-
-private:
explicit NFC(LocalFrame*);
- device::nfc::blink::NFCPtr m_nfc;
- mojo::Binding<device::nfc::blink::NFCClient> m_client;
- HeapHashSet<Member<ScriptPromiseResolver>> m_requests;
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/modules/nfc/DEPS ('k') | third_party/WebKit/Source/modules/nfc/NFC.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698