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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeysController.h

Issue 338713002: Remove duplicated provideMediaKeysTo() in MediaKeysClient.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MediaKeysController_h 5 #ifndef MediaKeysController_h
6 #define MediaKeysController_h 6 #define MediaKeysController_h
7 7
8 #include "core/page/Page.h" 8 #include "core/page/Page.h"
9 #include "wtf/PassOwnPtr.h" 9 #include "wtf/PassOwnPtr.h"
10 10
11 namespace blink { 11 namespace blink {
12 class WebContentDecryptionModule; 12 class WebContentDecryptionModule;
13 } 13 }
14 14
15 namespace WebCore { 15 namespace WebCore {
16 16
17 class ExecutionContext; 17 class ExecutionContext;
18 class MediaKeysClient; 18 class MediaKeysClient;
19 19
20 class MediaKeysController FINAL : public NoBaseWillBeGarbageCollected<MediaKeysC ontroller>, public WillBeHeapSupplement<Page> { 20 class MediaKeysController FINAL : public NoBaseWillBeGarbageCollected<MediaKeysC ontroller>, public WillBeHeapSupplement<Page> {
21 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController); 21 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController);
22 public: 22 public:
23 virtual ~MediaKeysController();
24
23 PassOwnPtr<blink::WebContentDecryptionModule> createContentDecryptionModule( ExecutionContext*, const String& keySystem); 25 PassOwnPtr<blink::WebContentDecryptionModule> createContentDecryptionModule( ExecutionContext*, const String& keySystem);
24 26
25 static void provideMediaKeysTo(Page&, MediaKeysClient*); 27 static void provideMediaKeysTo(Page&, PassOwnPtr<MediaKeysClient>);
26 static MediaKeysController* from(Page* page) { return static_cast<MediaKeysC ontroller*>(WillBeHeapSupplement<Page>::from(page, supplementName())); } 28 static MediaKeysController* from(Page* page) { return static_cast<MediaKeysC ontroller*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
27 29
28 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); } 30 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>:: trace(visitor); }
29 31
30 private: 32 private:
31 explicit MediaKeysController(MediaKeysClient*); 33 explicit MediaKeysController(PassOwnPtr<MediaKeysClient>);
32 static const char* supplementName(); 34 static const char* supplementName();
33 MediaKeysClient* m_client; 35 OwnPtr<MediaKeysClient> m_client;
34 }; 36 };
35 37
36 } // namespace WebCore 38 } // namespace WebCore
37 39
38 #endif // MediaKeysController_h 40 #endif // MediaKeysController_h
39 41
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698