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

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

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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 <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/rand_util.h" 13 #include "base/rand_util.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "content/browser/renderer_host/media/audio_input_device_manager.h" 15 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
16 #include "content/browser/renderer_host/media/media_stream_requester.h" 16 #include "content/browser/renderer_host/media/media_stream_requester.h"
17 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 17 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
18 #include "content/browser/renderer_host/media/video_capture_manager.h" 18 #include "content/browser/renderer_host/media/video_capture_manager.h"
19 #include "content/browser/renderer_host/media/web_contents_capture_util.h" 19 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/content_browser_client.h" 21 #include "content/public/browser/content_browser_client.h"
22 #include "content/public/browser/media_observer.h" 22 #include "content/public/browser/media_observer.h"
23 #include "content/public/browser/media_request_state.h" 23 #include "content/public/browser/media_request_state.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/common/media_stream_request.h" 25 #include "content/public/common/media_stream_request.h"
26 #include "googleurl/src/gurl.h"
27 #include "media/audio/audio_manager_base.h" 26 #include "media/audio/audio_manager_base.h"
28 #include "media/audio/audio_parameters.h" 27 #include "media/audio/audio_parameters.h"
29 #include "media/base/channel_layout.h" 28 #include "media/base/channel_layout.h"
29 #include "url/gurl.h"
30 30
31 #if defined(OS_WIN) 31 #if defined(OS_WIN)
32 #include "base/win/scoped_com_initializer.h" 32 #include "base/win/scoped_com_initializer.h"
33 #endif 33 #endif
34 34
35 namespace content { 35 namespace content {
36 36
37 // Creates a random label used to identify requests. 37 // Creates a random label used to identify requests.
38 static std::string RandomLabel() { 38 static std::string RandomLabel() {
39 // An earlier PeerConnection spec, 39 // An earlier PeerConnection spec,
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 } 1044 }
1045 1045
1046 // Always do enumeration even though some enumeration is in progress, 1046 // Always do enumeration even though some enumeration is in progress,
1047 // because those enumeration commands could be sent before these devices 1047 // because those enumeration commands could be sent before these devices
1048 // change. 1048 // change.
1049 ++active_enumeration_ref_count_[stream_type]; 1049 ++active_enumeration_ref_count_[stream_type];
1050 GetDeviceManager(stream_type)->EnumerateDevices(stream_type); 1050 GetDeviceManager(stream_type)->EnumerateDevices(stream_type);
1051 } 1051 }
1052 1052
1053 } // namespace content 1053 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698