Source/modules/encryptedmedia/MediaKeys.h - Issue 1227783004: Fix virtual/override/final usage in Source/modules/.

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: Source/modules/encryptedmedia/MediaKeys.h

Issue 1227783004: Fix virtual/override/final usage in Source/modules/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rebase Created 5 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 | « Source/modules/encryptedmedia/MediaKeySystemAccess.cpp ('k') | Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/encryptedmedia/MediaKeys.h

diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h

index 2e25c05ec8877052f3e3899a7ddb82381e39763d..6a667bd22e31aaf4a4731abfa19e9214b8b3b4be 100644

--- a/Source/modules/encryptedmedia/MediaKeys.h

+++ b/Source/modules/encryptedmedia/MediaKeys.h

@@ -54,7 +54,7 @@ class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ActiveDOMO

DEFINE_WRAPPERTYPEINFO();

public:

static MediaKeys* create(ExecutionContext*, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule>);

- virtual ~MediaKeys();

+ ~MediaKeys() override;

MediaKeySession* createSession(ScriptState*, const String& sessionTypeString, ExceptionState&);

@@ -75,9 +75,9 @@ public:

// FIXME: This class could derive from ContextLifecycleObserver

// again once hasPendingActivity() is moved to ScriptWrappable

// (http://crbug.com/483722).

- virtual void contextDestroyed() override;

- virtual bool hasPendingActivity() const override;

- virtual void stop() override;

+ void contextDestroyed() override;

+ bool hasPendingActivity() const override;

+ void stop() override;

private:

MediaKeys(ExecutionContext*, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule>);