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

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

Issue 2471803002: Remove MediaStreamTrack.getSources(). (Closed)
Patch Set: Fix platform-specific expectations file Created 4 years, 1 month 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public: 42 public:
43 static UserMediaController* create(std::unique_ptr<UserMediaClient>); 43 static UserMediaController* create(std::unique_ptr<UserMediaClient>);
44 44
45 DECLARE_VIRTUAL_TRACE(); 45 DECLARE_VIRTUAL_TRACE();
46 46
47 UserMediaClient* client() const { return m_client.get(); } 47 UserMediaClient* client() const { return m_client.get(); }
48 48
49 void requestUserMedia(UserMediaRequest*); 49 void requestUserMedia(UserMediaRequest*);
50 void cancelUserMediaRequest(UserMediaRequest*); 50 void cancelUserMediaRequest(UserMediaRequest*);
51 void requestMediaDevices(MediaDevicesRequest*); 51 void requestMediaDevices(MediaDevicesRequest*);
52 void requestSources(MediaStreamTrackSourcesRequest*);
53 void setMediaDeviceChangeObserver(MediaDevices*); 52 void setMediaDeviceChangeObserver(MediaDevices*);
54 53
55 static const char* supplementName(); 54 static const char* supplementName();
56 static UserMediaController* from(LocalFrame* frame) { 55 static UserMediaController* from(LocalFrame* frame) {
57 return static_cast<UserMediaController*>( 56 return static_cast<UserMediaController*>(
58 Supplement<LocalFrame>::from(frame, supplementName())); 57 Supplement<LocalFrame>::from(frame, supplementName()));
59 } 58 }
60 59
61 private: 60 private:
62 explicit UserMediaController(std::unique_ptr<UserMediaClient>); 61 explicit UserMediaController(std::unique_ptr<UserMediaClient>);
63 62
64 std::unique_ptr<UserMediaClient> m_client; 63 std::unique_ptr<UserMediaClient> m_client;
65 }; 64 };
66 65
67 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) { 66 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) {
68 m_client->requestUserMedia(request); 67 m_client->requestUserMedia(request);
69 } 68 }
70 69
71 inline void UserMediaController::cancelUserMediaRequest( 70 inline void UserMediaController::cancelUserMediaRequest(
72 UserMediaRequest* request) { 71 UserMediaRequest* request) {
73 m_client->cancelUserMediaRequest(request); 72 m_client->cancelUserMediaRequest(request);
74 } 73 }
75 74
76 inline void UserMediaController::requestMediaDevices( 75 inline void UserMediaController::requestMediaDevices(
77 MediaDevicesRequest* request) { 76 MediaDevicesRequest* request) {
78 m_client->requestMediaDevices(request); 77 m_client->requestMediaDevices(request);
79 } 78 }
80 79
81 inline void UserMediaController::requestSources(
82 MediaStreamTrackSourcesRequest* request) {
83 m_client->requestSources(request);
84 }
85
86 inline void UserMediaController::setMediaDeviceChangeObserver( 80 inline void UserMediaController::setMediaDeviceChangeObserver(
87 MediaDevices* observer) { 81 MediaDevices* observer) {
88 m_client->setMediaDeviceChangeObserver(observer); 82 m_client->setMediaDeviceChangeObserver(observer);
89 } 83 }
90 84
91 } // namespace blink 85 } // namespace blink
92 86
93 #endif // UserMediaController_h 87 #endif // UserMediaController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698