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

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

Issue 560843002: Interface for requestSources through UserMediaController/Client. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed change in MediaStreamTrack. Empty default impl of requestSources. Rebase. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/mediastream/UserMediaClient.h ('k') | Source/web/UserMediaClientImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 29 matching lines...) Expand all
40 public: 40 public:
41 41
42 UserMediaClient* client() const { return m_client; } 42 UserMediaClient* client() const { return m_client; }
43 43
44 void requestUserMedia(UserMediaRequest*); 44 void requestUserMedia(UserMediaRequest*);
45 void cancelUserMediaRequest(UserMediaRequest*); 45 void cancelUserMediaRequest(UserMediaRequest*);
46 46
47 void requestMediaDevices(MediaDevicesRequest*); 47 void requestMediaDevices(MediaDevicesRequest*);
48 void cancelMediaDevicesRequest(MediaDevicesRequest*); 48 void cancelMediaDevicesRequest(MediaDevicesRequest*);
49 49
50 void requestSources(MediaStreamTrackSourcesRequest*);
51
50 static PassOwnPtrWillBeRawPtr<UserMediaController> create(UserMediaClient*); 52 static PassOwnPtrWillBeRawPtr<UserMediaController> create(UserMediaClient*);
51 static const char* supplementName(); 53 static const char* supplementName();
52 static UserMediaController* from(LocalFrame* frame) { return static_cast<Use rMediaController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName( ))); } 54 static UserMediaController* from(LocalFrame* frame) { return static_cast<Use rMediaController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName( ))); }
53 55
54 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<LocalFr ame>::trace(visitor); } 56 virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<LocalFr ame>::trace(visitor); }
55 57
56 protected: 58 protected:
57 explicit UserMediaController(UserMediaClient*); 59 explicit UserMediaController(UserMediaClient*);
58 60
59 private: 61 private:
(...skipping 13 matching lines...) Expand all
73 inline void UserMediaController::requestMediaDevices(MediaDevicesRequest* reques t) 75 inline void UserMediaController::requestMediaDevices(MediaDevicesRequest* reques t)
74 { 76 {
75 m_client->requestMediaDevices(request); 77 m_client->requestMediaDevices(request);
76 } 78 }
77 79
78 inline void UserMediaController::cancelMediaDevicesRequest(MediaDevicesRequest* request) 80 inline void UserMediaController::cancelMediaDevicesRequest(MediaDevicesRequest* request)
79 { 81 {
80 m_client->cancelMediaDevicesRequest(request); 82 m_client->cancelMediaDevicesRequest(request);
81 } 83 }
82 84
85 inline void UserMediaController::requestSources(MediaStreamTrackSourcesRequest* request)
86 {
87 m_client->requestSources(request);
88 }
89
83 } // namespace blink 90 } // namespace blink
84 91
85 #endif // UserMediaController_h 92 #endif // UserMediaController_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/UserMediaClient.h ('k') | Source/web/UserMediaClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698