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

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

Issue 1060813005: Componentization: fix SupplementTracing<0>::~SupplementTracing<0>(void) already defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: DOMWindowStorageController.h should include Document.h Created 5 years, 8 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 "modules/ModulesExport.h" 9 #include "modules/ModulesExport.h"
10 #include "wtf/PassOwnPtr.h" 10 #include "wtf/PassOwnPtr.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 class ExecutionContext; 14 class ExecutionContext;
15 class MediaKeysClient; 15 class MediaKeysClient;
16 class Page;
haraken 2015/04/22 09:19:43 Don't we need to include Page.h? (You're including
tasak 2015/04/22 10:22:21 Removed class Page;
16 class WebContentDecryptionModule; 17 class WebContentDecryptionModule;
17 class WebEncryptedMediaClient; 18 class WebEncryptedMediaClient;
18 19
19 class MODULES_EXPORT MediaKeysController final : public NoBaseWillBeGarbageColle cted<MediaKeysController>, public WillBeHeapSupplement<Page> { 20 class MODULES_EXPORT MediaKeysController final : public NoBaseWillBeGarbageColle cted<MediaKeysController>, public WillBeHeapSupplement<Page> {
20 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController); 21 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeysController);
21 public: 22 public:
22 WebEncryptedMediaClient* encryptedMediaClient(ExecutionContext*); 23 WebEncryptedMediaClient* encryptedMediaClient(ExecutionContext*);
23 24
24 static void provideMediaKeysTo(Page&, MediaKeysClient*); 25 static void provideMediaKeysTo(Page&, MediaKeysClient*);
25 static MediaKeysController* from(Page* page) { return static_cast<MediaKeysC ontroller*>(WillBeHeapSupplement<Page>::from(page, supplementName())); } 26 static MediaKeysController* from(Page* page) { return static_cast<MediaKeysC ontroller*>(WillBeHeapSupplement<Page>::from(page, supplementName())); }
26 27
27 DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor); } 28 DEFINE_INLINE_VIRTUAL_TRACE() { WillBeHeapSupplement<Page>::trace(visitor); }
28 29
29 private: 30 private:
30 explicit MediaKeysController(MediaKeysClient*); 31 explicit MediaKeysController(MediaKeysClient*);
31 static const char* supplementName(); 32 static const char* supplementName();
32 MediaKeysClient* m_client; 33 MediaKeysClient* m_client;
33 }; 34 };
34 35
35 } // namespace blink 36 } // namespace blink
36 37
37 #endif // MediaKeysController_h 38 #endif // MediaKeysController_h
38 39
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698