| Index: Source/modules/plugins/NavigatorPlugins.h
|
| diff --git a/Source/modules/plugins/NavigatorPlugins.h b/Source/modules/plugins/NavigatorPlugins.h
|
| index c2a99f78d1cf7c187ea25d5184ead3544cb43725..6f0de460216700dc62461d8f0e1bcc7fe66be7bb 100644
|
| --- a/Source/modules/plugins/NavigatorPlugins.h
|
| +++ b/Source/modules/plugins/NavigatorPlugins.h
|
| @@ -15,16 +15,14 @@ class DOMPluginArray;
|
| class LocalFrame;
|
| class Navigator;
|
|
|
| -class NavigatorPlugins final
|
| - : public NoBaseWillBeGarbageCollected<NavigatorPlugins>
|
| - , public WillBeHeapSupplement<Navigator>
|
| - , DOMWindowProperty {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorPlugins);
|
| - DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorPlugins);
|
| +// TODO(Oilpan): when ~DOMWindowProperty is removed, derive from GarbageCollected<> instead.
|
| +class NavigatorPlugins final : public GarbageCollectedFinalized<NavigatorPlugins>, public HeapSupplement<Navigator>, DOMWindowProperty {
|
| + USING_GARBAGE_COLLECTED_MIXIN(NavigatorPlugins);
|
| public:
|
| static NavigatorPlugins& from(Navigator&);
|
| static NavigatorPlugins* toNavigatorPlugins(Navigator&);
|
| - static const char* supplementName();
|
| +
|
| + virtual ~NavigatorPlugins();
|
|
|
| static DOMPluginArray* plugins(Navigator&);
|
| static DOMMimeTypeArray* mimeTypes(Navigator&);
|
| @@ -35,6 +33,8 @@ public:
|
| private:
|
| explicit NavigatorPlugins(Navigator&);
|
|
|
| + static const char* supplementName();
|
| +
|
| DOMPluginArray* plugins(LocalFrame*) const;
|
| DOMMimeTypeArray* mimeTypes(LocalFrame*) const;
|
| bool javaEnabled(LocalFrame*) const;
|
|
|