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

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.h

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
Index: Source/modules/encryptedmedia/MediaKeySession.h
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
index 31c1a202759f25c5051e316d90a397139bba4dcd..17b39bb865d5d2c7bbe36b23d1d7197b4ad8aec0 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -58,7 +58,7 @@ class WebString;
// Because this object controls the lifetime of the WebContentDecryptionModuleSession,
// it may outlive any JavaScript references as long as the MediaKeys object is alive.
// The WebContentDecryptionModuleSession has the same lifetime as this object.
-class MediaKeySession FINAL
+class MediaKeySession final
: public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaKeySession>, public ActiveDOMObject, public EventTargetWithInlineData
, private WebContentDecryptionModuleSession::Client {
DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<MediaKeySession>);
@@ -85,14 +85,14 @@ public:
void enqueueEvent(PassRefPtrWillBeRawPtr<Event>);
// EventTarget
- virtual const AtomicString& interfaceName() const OVERRIDE;
- virtual ExecutionContext* executionContext() const OVERRIDE;
+ virtual const AtomicString& interfaceName() const override;
+ virtual ExecutionContext* executionContext() const override;
// ActiveDOMObject
- virtual bool hasPendingActivity() const OVERRIDE;
- virtual void stop() OVERRIDE;
+ virtual bool hasPendingActivity() const override;
+ virtual void stop() override;
- virtual void trace(Visitor*) OVERRIDE;
+ virtual void trace(Visitor*) override;
private:
class PendingAction;
@@ -103,11 +103,11 @@ private:
void actionTimerFired(Timer<MediaKeySession>*);
// WebContentDecryptionModuleSession::Client
- virtual void message(const unsigned char* message, size_t messageLength, const WebURL& destinationURL) OVERRIDE;
- virtual void ready() OVERRIDE;
- virtual void close() OVERRIDE;
- virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
- virtual void error(WebContentDecryptionModuleException, unsigned long systemCode, const WebString& errorMessage) OVERRIDE;
+ virtual void message(const unsigned char* message, size_t messageLength, const WebURL& destinationURL) override;
+ virtual void ready() override;
+ virtual void close() override;
+ virtual void error(MediaKeyErrorCode, unsigned long systemCode) override;
+ virtual void error(WebContentDecryptionModuleException, unsigned long systemCode, const WebString& errorMessage) override;
ScriptPromise generateRequestInternal(ScriptState*, const String& initDataType, PassRefPtr<ArrayBuffer> initData);
ScriptPromise updateInternal(ScriptState*, PassRefPtr<ArrayBuffer> response);
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeyNeededEvent.h ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698