Index: Source/modules/netinfo/NavigatorNetworkInformation.h |
diff --git a/Source/modules/netinfo/NavigatorNetworkInformation.h b/Source/modules/netinfo/NavigatorNetworkInformation.h |
index e4e15ade73673df6911e365d945b4a7009b66f49..a2b34ebcede5849284ab0f0c354a34a0e290ca2e 100644 |
--- a/Source/modules/netinfo/NavigatorNetworkInformation.h |
+++ b/Source/modules/netinfo/NavigatorNetworkInformation.h |
@@ -13,16 +13,14 @@ namespace blink { |
class Navigator; |
class NetworkInformation; |
-class NavigatorNetworkInformation final |
- : public NoBaseWillBeGarbageCollected<NavigatorNetworkInformation> |
- , public WillBeHeapSupplement<Navigator> |
- , DOMWindowProperty { |
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorNetworkInformation); |
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorNetworkInformation); |
+// TODO(Oilpan): when ~DOMWindowProperty is removed, derive from GarbageCollected<> instead. |
+class NavigatorNetworkInformation final : public GarbageCollectedFinalized<NavigatorNetworkInformation>, public HeapSupplement<Navigator>, DOMWindowProperty { |
+ USING_GARBAGE_COLLECTED_MIXIN(NavigatorNetworkInformation); |
public: |
static NavigatorNetworkInformation& from(Navigator&); |
static NavigatorNetworkInformation* toNavigatorNetworkInformation(Navigator&); |
- static const char* supplementName(); |
+ |
+ virtual ~NavigatorNetworkInformation(); |
static NetworkInformation* connection(Navigator&); |
@@ -32,7 +30,9 @@ private: |
explicit NavigatorNetworkInformation(Navigator&); |
NetworkInformation* connection(); |
- PersistentWillBeMember<NetworkInformation> m_connection; |
+ static const char* supplementName(); |
+ |
+ Member<NetworkInformation> m_connection; |
}; |
} // namespace blink |