Source/modules/encryptedmedia/MediaKeys.h - Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeys.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 unified diff | Download patch

« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/encryptedmedia/MediaKeysController.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Apple Inc. All rights reserved.	2 * Copyright (C) 2013 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53	53

54 MediaKeySession* createSession(ScriptState*, const String& sessionType);	54 MediaKeySession* createSession(ScriptState*, const String& sessionType);

55	55

56 static bool isTypeSupported(const String& keySystem, const String& contentTy pe);	56 static bool isTypeSupported(const String& keySystem, const String& contentTy pe);

57	57

58 blink::WebContentDecryptionModule* contentDecryptionModule();	58 blink::WebContentDecryptionModule* contentDecryptionModule();

59	59

60 void trace(Visitor*);	60 void trace(Visitor*);

61	61

62 // ContextLifecycleObserver	62 // ContextLifecycleObserver

63 virtual void contextDestroyed() OVERRIDE;	63 virtual void contextDestroyed() override;

64	64

65 private:	65 private:

66 friend class MediaKeysInitializer;	66 friend class MediaKeysInitializer;

67 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>);	67 MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebC ontentDecryptionModule>);

68	68

69 const String m_keySystem;	69 const String m_keySystem;

70 OwnPtr<blink::WebContentDecryptionModule> m_cdm;	70 OwnPtr<blink::WebContentDecryptionModule> m_cdm;

71 };	71 };

72	72

73 } // namespace blink	73 } // namespace blink

74	74

75 #endif // MediaKeys_h	75 #endif // MediaKeys_h

OLD	NEW