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

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

Issue 2377613002: Remove cancelMediaDevicesRequest dead code. (Closed)
Patch Set: Created 4 years, 2 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 27 matching lines...) Expand all
38 USING_GARBAGE_COLLECTED_MIXIN(UserMediaController); 38 USING_GARBAGE_COLLECTED_MIXIN(UserMediaController);
39 public: 39 public:
40 static UserMediaController* create(std::unique_ptr<UserMediaClient>); 40 static UserMediaController* create(std::unique_ptr<UserMediaClient>);
41 41
42 DECLARE_VIRTUAL_TRACE(); 42 DECLARE_VIRTUAL_TRACE();
43 43
44 UserMediaClient* client() const { return m_client.get(); } 44 UserMediaClient* client() const { return m_client.get(); }
45 45
46 void requestUserMedia(UserMediaRequest*); 46 void requestUserMedia(UserMediaRequest*);
47 void cancelUserMediaRequest(UserMediaRequest*); 47 void cancelUserMediaRequest(UserMediaRequest*);
48
49 void requestMediaDevices(MediaDevicesRequest*); 48 void requestMediaDevices(MediaDevicesRequest*);
50 void cancelMediaDevicesRequest(MediaDevicesRequest*);
51
52 void requestSources(MediaStreamTrackSourcesRequest*); 49 void requestSources(MediaStreamTrackSourcesRequest*);
53
54 void setMediaDeviceChangeObserver(MediaDevices*); 50 void setMediaDeviceChangeObserver(MediaDevices*);
55 51
56 static const char* supplementName(); 52 static const char* supplementName();
57 static UserMediaController* from(LocalFrame* frame) { return static_cast<Use rMediaController*>(Supplement<LocalFrame>::from(frame, supplementName())); } 53 static UserMediaController* from(LocalFrame* frame) { return static_cast<Use rMediaController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
58 54
59 private: 55 private:
60 explicit UserMediaController(std::unique_ptr<UserMediaClient>); 56 explicit UserMediaController(std::unique_ptr<UserMediaClient>);
61 57
62 std::unique_ptr<UserMediaClient> m_client; 58 std::unique_ptr<UserMediaClient> m_client;
63 }; 59 };
64 60
65 inline void UserMediaController::requestUserMedia(UserMediaRequest* request) 61 inline void UserMediaController::requestUserMedia(UserMediaRequest* request)
66 { 62 {
67 m_client->requestUserMedia(request); 63 m_client->requestUserMedia(request);
68 } 64 }
69 65
70 inline void UserMediaController::cancelUserMediaRequest(UserMediaRequest* reques t) 66 inline void UserMediaController::cancelUserMediaRequest(UserMediaRequest* reques t)
71 { 67 {
72 m_client->cancelUserMediaRequest(request); 68 m_client->cancelUserMediaRequest(request);
73 } 69 }
74 70
75 inline void UserMediaController::requestMediaDevices(MediaDevicesRequest* reques t) 71 inline void UserMediaController::requestMediaDevices(MediaDevicesRequest* reques t)
76 { 72 {
77 m_client->requestMediaDevices(request); 73 m_client->requestMediaDevices(request);
78 } 74 }
79 75
80 inline void UserMediaController::cancelMediaDevicesRequest(MediaDevicesRequest* request)
81 {
82 m_client->cancelMediaDevicesRequest(request);
83 }
84
85 inline void UserMediaController::requestSources(MediaStreamTrackSourcesRequest* request) 76 inline void UserMediaController::requestSources(MediaStreamTrackSourcesRequest* request)
86 { 77 {
87 m_client->requestSources(request); 78 m_client->requestSources(request);
88 } 79 }
89 80
90 inline void UserMediaController::setMediaDeviceChangeObserver(MediaDevices* obse rver) 81 inline void UserMediaController::setMediaDeviceChangeObserver(MediaDevices* obse rver)
91 { 82 {
92 m_client->setMediaDeviceChangeObserver(observer); 83 m_client->setMediaDeviceChangeObserver(observer);
93 } 84 }
94 85
95 } // namespace blink 86 } // namespace blink
96 87
97 #endif // UserMediaController_h 88 #endif // UserMediaController_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/UserMediaClient.h ('k') | third_party/WebKit/Source/web/UserMediaClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698