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

Side by Side Diff: content/browser/media/media_internals.h

Issue 2415703002: Move files video_capture*.* from media/base to media/capture (Closed)
Patch Set: rebase Created 4 years, 1 month 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_BROWSER_MEDIA_MEDIA_INTERNALS_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
6 #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_ 6 #define CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <tuple> 11 #include <tuple>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/callback_forward.h" 14 #include "base/callback_forward.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "base/synchronization/lock.h" 19 #include "base/synchronization/lock.h"
20 #include "base/values.h" 20 #include "base/values.h"
21 #include "content/common/content_export.h" 21 #include "content/common/content_export.h"
22 #include "content/public/browser/notification_observer.h" 22 #include "content/public/browser/notification_observer.h"
23 #include "content/public/browser/notification_registrar.h" 23 #include "content/public/browser/notification_registrar.h"
24 #include "media/audio/audio_logging.h" 24 #include "media/audio/audio_logging.h"
25 #include "media/base/media_log.h" 25 #include "media/base/media_log.h"
26 #include "media/base/video_capture_types.h"
27 #include "media/capture/video/video_capture_device_descriptor.h" 26 #include "media/capture/video/video_capture_device_descriptor.h"
27 #include "media/capture/video_capture_types.h"
28 28
29 namespace media { 29 namespace media {
30 class AudioParameters; 30 class AudioParameters;
31 struct MediaLogEvent; 31 struct MediaLogEvent;
32 } 32 }
33 33
34 namespace content { 34 namespace content {
35 35
36 // This class stores information about currently active media. 36 // This class stores information about currently active media.
37 class CONTENT_EXPORT MediaInternals 37 class CONTENT_EXPORT MediaInternals
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 base::DictionaryValue audio_streams_cached_data_; 139 base::DictionaryValue audio_streams_cached_data_;
140 int owner_ids_[AUDIO_COMPONENT_MAX]; 140 int owner_ids_[AUDIO_COMPONENT_MAX];
141 std::unique_ptr<MediaInternalsUMAHandler> uma_handler_; 141 std::unique_ptr<MediaInternalsUMAHandler> uma_handler_;
142 142
143 DISALLOW_COPY_AND_ASSIGN(MediaInternals); 143 DISALLOW_COPY_AND_ASSIGN(MediaInternals);
144 }; 144 };
145 145
146 } // namespace content 146 } // namespace content
147 147
148 #endif // CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_ 148 #endif // CONTENT_BROWSER_MEDIA_MEDIA_INTERNALS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698