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

Side by Side Diff: content/renderer/media/user_media_client_impl.h

Issue 1943213002: Reland of Add support for device-change notifications to MediaStreamDispatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use EXPECT_DEATH_IF_SUPPORTED instead of EXPECT_DEATH Created 4 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 void OnStreamGenerationFailed(int request_id, 76 void OnStreamGenerationFailed(int request_id,
77 MediaStreamRequestResult result) override; 77 MediaStreamRequestResult result) override;
78 void OnDeviceStopped(const std::string& label, 78 void OnDeviceStopped(const std::string& label,
79 const StreamDeviceInfo& device_info) override; 79 const StreamDeviceInfo& device_info) override;
80 void OnDevicesEnumerated(int request_id, 80 void OnDevicesEnumerated(int request_id,
81 const StreamDeviceInfoArray& device_array) override; 81 const StreamDeviceInfoArray& device_array) override;
82 void OnDeviceOpened(int request_id, 82 void OnDeviceOpened(int request_id,
83 const std::string& label, 83 const std::string& label,
84 const StreamDeviceInfo& device_info) override; 84 const StreamDeviceInfo& device_info) override;
85 void OnDeviceOpenFailed(int request_id) override; 85 void OnDeviceOpenFailed(int request_id) override;
86 void OnDevicesChanged() override;
86 87
87 // RenderFrameObserver override 88 // RenderFrameObserver override
88 void FrameWillClose() override; 89 void FrameWillClose() override;
89 90
90 protected: 91 protected:
91 // Called when |source| has been stopped from JavaScript. 92 // Called when |source| has been stopped from JavaScript.
92 void OnLocalSourceStopped(const blink::WebMediaStreamSource& source); 93 void OnLocalSourceStopped(const blink::WebMediaStreamSource& source);
93 94
94 // These methods are virtual for test purposes. A test can override them to 95 // These methods are virtual for test purposes. A test can override them to
95 // test requesting local media streams. The function notifies WebKit that the 96 // test requesting local media streams. The function notifies WebKit that the
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 // Note: This member must be the last to ensure all outstanding weak pointers 262 // Note: This member must be the last to ensure all outstanding weak pointers
262 // are invalidated first. 263 // are invalidated first.
263 base::WeakPtrFactory<UserMediaClientImpl> weak_factory_; 264 base::WeakPtrFactory<UserMediaClientImpl> weak_factory_;
264 265
265 DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl); 266 DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl);
266 }; 267 };
267 268
268 } // namespace content 269 } // namespace content
269 270
270 #endif // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_ 271 #endif // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698