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

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

Issue 937293002: Unify request failure handling in content::UserMediaClientImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed remaining breaks + updated unit test code Created 5 years, 10 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
« no previous file with comments | « no previous file | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void OnLocalSourceStopped(const blink::WebMediaStreamSource& source); 92 void OnLocalSourceStopped(const blink::WebMediaStreamSource& source);
93 93
94 // These methods are virtual for test purposes. A test can override them to 94 // 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 95 // test requesting local media streams. The function notifies WebKit that the
96 // |request| have completed. 96 // |request| have completed.
97 virtual void GetUserMediaRequestSucceeded( 97 virtual void GetUserMediaRequestSucceeded(
98 const blink::WebMediaStream& stream, 98 const blink::WebMediaStream& stream,
99 blink::WebUserMediaRequest* request_info); 99 blink::WebUserMediaRequest* request_info);
100 virtual void GetUserMediaRequestFailed( 100 virtual void GetUserMediaRequestFailed(
101 blink::WebUserMediaRequest* request_info, 101 blink::WebUserMediaRequest* request_info,
102 MediaStreamRequestResult result);
103 virtual void GetUserMediaRequestTrackStartedFailed(
104 blink::WebUserMediaRequest* request_info,
105 MediaStreamRequestResult result, 102 MediaStreamRequestResult result,
106 const blink::WebString& result_name); 103 const blink::WebString& result_name);
107 virtual void EnumerateDevicesSucceded( 104 virtual void EnumerateDevicesSucceded(
108 blink::WebMediaDevicesRequest* request, 105 blink::WebMediaDevicesRequest* request,
109 blink::WebVector<blink::WebMediaDeviceInfo>& devices); 106 blink::WebVector<blink::WebMediaDeviceInfo>& devices);
110 virtual void EnumerateSourcesSucceded( 107 virtual void EnumerateSourcesSucceded(
111 blink::WebMediaStreamTrackSourcesRequest* request, 108 blink::WebMediaStreamTrackSourcesRequest* request,
112 blink::WebVector<blink::WebSourceInfo>& sources); 109 blink::WebVector<blink::WebSourceInfo>& sources);
113 // Creates a MediaStreamVideoSource object. 110 // Creates a MediaStreamVideoSource object.
114 // This is virtual for test purposes. 111 // This is virtual for test purposes.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // Note: This member must be the last to ensure all outstanding weak pointers 246 // Note: This member must be the last to ensure all outstanding weak pointers
250 // are invalidated first. 247 // are invalidated first.
251 base::WeakPtrFactory<UserMediaClientImpl> weak_factory_; 248 base::WeakPtrFactory<UserMediaClientImpl> weak_factory_;
252 249
253 DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl); 250 DISALLOW_COPY_AND_ASSIGN(UserMediaClientImpl);
254 }; 251 };
255 252
256 } // namespace content 253 } // namespace content
257 254
258 #endif // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_ 255 #endif // CONTENT_RENDERER_MEDIA_USER_MEDIA_CLIENT_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698