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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2224643002: Move device monitors out of //media/capture into //media/device_monitors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « content/browser/browser_main_loop.cc ('k') | media/BUILD.gn » ('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 #include "content/browser/renderer_host/media/media_stream_manager.h" 5 #include "content/browser/renderer_host/media/media_stream_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h> 9 #include <string.h>
10 #include <algorithm> 10 #include <algorithm>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 #if defined(OS_WIN) 61 #if defined(OS_WIN)
62 #include "base/win/scoped_com_initializer.h" 62 #include "base/win/scoped_com_initializer.h"
63 #endif 63 #endif
64 64
65 #if defined(OS_CHROMEOS) 65 #if defined(OS_CHROMEOS)
66 #include "chromeos/audio/cras_audio_handler.h" 66 #include "chromeos/audio/cras_audio_handler.h"
67 #endif 67 #endif
68 68
69 #if defined(OS_MACOSX) 69 #if defined(OS_MACOSX)
70 #include "media/capture/device_monitor_mac.h" 70 #include "media/device_monitors/device_monitor_mac.h"
71 #endif 71 #endif
72 72
73 namespace content { 73 namespace content {
74 74
75 base::LazyInstance<base::ThreadLocalPointer<MediaStreamManager>>::Leaky 75 base::LazyInstance<base::ThreadLocalPointer<MediaStreamManager>>::Leaky
76 g_media_stream_manager_tls_ptr = LAZY_INSTANCE_INITIALIZER; 76 g_media_stream_manager_tls_ptr = LAZY_INSTANCE_INITIALIZER;
77 77
78 namespace { 78 namespace {
79 // Creates a random label used to identify requests. 79 // Creates a random label used to identify requests.
80 std::string RandomLabel() { 80 std::string RandomLabel() {
(...skipping 2100 matching lines...) Expand 10 before | Expand all | Expand 10 after
2181 if (device_info.session_id == session_id && 2181 if (device_info.session_id == session_id &&
2182 device_info.device.type == type) { 2182 device_info.device.type == type) {
2183 request->SetCapturingLinkSecured(is_secure); 2183 request->SetCapturingLinkSecured(is_secure);
2184 return; 2184 return;
2185 } 2185 }
2186 } 2186 }
2187 } 2187 }
2188 } 2188 }
2189 2189
2190 } // namespace content 2190 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698