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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/UserMediaController.h

Issue 2614143002: Use a new Supplement constructor for LocalFrame's supplements (Closed)
Patch Set: Created 3 years, 11 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 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 22 matching lines...) Expand all
33 class MediaDevices; 33 class MediaDevices;
34 class MediaDevicesRequest; 34 class MediaDevicesRequest;
35 class UserMediaRequest; 35 class UserMediaRequest;
36 36
37 class UserMediaController final 37 class UserMediaController final
38 : public GarbageCollectedFinalized<UserMediaController>, 38 : public GarbageCollectedFinalized<UserMediaController>,
39 public Supplement<LocalFrame> { 39 public Supplement<LocalFrame> {
40 USING_GARBAGE_COLLECTED_MIXIN(UserMediaController); 40 USING_GARBAGE_COLLECTED_MIXIN(UserMediaController);
41 41
42 public: 42 public:
43 static UserMediaController* create(std::unique_ptr<UserMediaClient>); 43 UserMediaController(LocalFrame&, std::unique_ptr<UserMediaClient>);
44
45 DECLARE_VIRTUAL_TRACE(); 44 DECLARE_VIRTUAL_TRACE();
46 45
47 UserMediaClient* client() const { return m_client.get(); } 46 UserMediaClient* client() const { return m_client.get(); }
48 47
49 void requestUserMedia(UserMediaRequest*); 48 void requestUserMedia(UserMediaRequest*);
50 void cancelUserMediaRequest(UserMediaRequest*); 49 void cancelUserMediaRequest(UserMediaRequest*);
51 void requestMediaDevices(MediaDevicesRequest*); 50 void requestMediaDevices(MediaDevicesRequest*);
52 void setMediaDeviceChangeObserver(MediaDevices*); 51 void setMediaDeviceChangeObserver(MediaDevices*);
53 52
54 static const char* supplementName(); 53 static const char* supplementName();
55 static UserMediaController* from(LocalFrame* frame) { 54 static UserMediaController* from(LocalFrame* frame) {
56 return static_cast<UserMediaController*>( 55 return static_cast<UserMediaController*>(
57 Supplement<LocalFrame>::from(frame, supplementName())); 56 Supplement<LocalFrame>::from(frame, supplementName()));
58 } 57 }
59 58
60 private: 59 private:
61 explicit UserMediaController(std::unique_ptr<UserMediaClient>);
62
63 std::unique_ptr<UserMediaClient> m_client; 60 std::unique_ptr<UserMediaClient> m_client;
64 }; 61 };
65 62
66 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) { 63 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) {
67 m_client->requestUserMedia(request); 64 m_client->requestUserMedia(request);
68 } 65 }
69 66
70 inline void UserMediaController::cancelUserMediaRequest( 67 inline void UserMediaController::cancelUserMediaRequest(
71 UserMediaRequest* request) { 68 UserMediaRequest* request) {
72 m_client->cancelUserMediaRequest(request); 69 m_client->cancelUserMediaRequest(request);
73 } 70 }
74 71
75 inline void UserMediaController::requestMediaDevices( 72 inline void UserMediaController::requestMediaDevices(
76 MediaDevicesRequest* request) { 73 MediaDevicesRequest* request) {
77 m_client->requestMediaDevices(request); 74 m_client->requestMediaDevices(request);
78 } 75 }
79 76
80 inline void UserMediaController::setMediaDeviceChangeObserver( 77 inline void UserMediaController::setMediaDeviceChangeObserver(
81 MediaDevices* observer) { 78 MediaDevices* observer) {
82 m_client->setMediaDeviceChangeObserver(observer); 79 m_client->setMediaDeviceChangeObserver(observer);
83 } 80 }
84 81
85 } // namespace blink 82 } // namespace blink
86 83
87 #endif // UserMediaController_h 84 #endif // UserMediaController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698