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

Side by Side Diff: chrome/browser/media/webrtc/media_capture_devices_dispatcher.h

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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 CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ 6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector>
13 14
14 #include "base/callback.h" 15 #include "base/callback.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/memory/scoped_vector.h"
17 #include "base/memory/singleton.h" 17 #include "base/memory/singleton.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "content/public/browser/media_observer.h" 19 #include "content/public/browser/media_observer.h"
20 #include "content/public/browser/web_contents_delegate.h" 20 #include "content/public/browser/web_contents_delegate.h"
21 #include "content/public/common/media_stream_request.h" 21 #include "content/public/common/media_stream_request.h"
22 22
23 class DesktopStreamsRegistry; 23 class DesktopStreamsRegistry;
24 class MediaAccessHandler; 24 class MediaAccessHandler;
25 class MediaStreamCaptureIndicator; 25 class MediaStreamCaptureIndicator;
26 class Profile; 26 class Profile;
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 base::ObserverList<Observer> observers_; 200 base::ObserverList<Observer> observers_;
201 201
202 // Flag used by unittests to disable device enumeration. 202 // Flag used by unittests to disable device enumeration.
203 bool is_device_enumeration_disabled_; 203 bool is_device_enumeration_disabled_;
204 204
205 scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_; 205 scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;
206 206
207 std::unique_ptr<DesktopStreamsRegistry> desktop_streams_registry_; 207 std::unique_ptr<DesktopStreamsRegistry> desktop_streams_registry_;
208 208
209 // Handlers for processing media access requests. 209 // Handlers for processing media access requests.
210 ScopedVector<MediaAccessHandler> media_access_handlers_; 210 std::vector<std::unique_ptr<MediaAccessHandler>> media_access_handlers_;
211 211
212 DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher); 212 DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
213 }; 213 };
214 214
215 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ 215 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698