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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/rand_util.h" 11 #include "base/rand_util.h"
12 #include "content/browser/renderer_host/media/audio_input_device_manager.h" 12 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
13 #include "content/browser/renderer_host/media/media_stream_device_settings.h" 13 #include "content/browser/renderer_host/media/media_stream_device_settings.h"
14 #include "content/browser/renderer_host/media/media_stream_requester.h" 14 #include "content/browser/renderer_host/media/media_stream_requester.h"
15 #include "content/browser/renderer_host/media/video_capture_manager.h" 15 #include "content/browser/renderer_host/media/video_capture_manager.h"
16 #include "content/common/media/media_stream_options.h" 16 #include "content/common/media/media_stream_options.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 18
19 using content::BrowserThread;
20
19 namespace media_stream { 21 namespace media_stream {
20 22
21 // Creates a random label used to identify requests. 23 // Creates a random label used to identify requests.
22 static std::string RandomLabel() { 24 static std::string RandomLabel() {
23 // Alphabet according to WhatWG standard, i.e. containing 36 characters from 25 // Alphabet according to WhatWG standard, i.e. containing 36 characters from
24 // range: U+0021, U+0023 to U+0027, U+002A to U+002B, U+002D to U+002E, 26 // range: U+0021, U+0023 to U+0027, U+002A to U+002B, U+002D to U+002E,
25 // U+0030 to U+0039, U+0041 to U+005A, U+005E to U+007E. 27 // U+0030 to U+0039, U+0041 to U+005A, U+005E to U+007E.
26 static const char alphabet[] = "!#$%&\'*+-.0123456789" 28 static const char alphabet[] = "!#$%&\'*+-.0123456789"
27 "abcdefghijklmnopqrstuvwxyz^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~"; 29 "abcdefghijklmnopqrstuvwxyz^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~";
28 30
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 MediaStreamRequester* requester, const StreamOptions& request_options) 415 MediaStreamRequester* requester, const StreamOptions& request_options)
414 : requester(requester), 416 : requester(requester),
415 options(request_options), 417 options(request_options),
416 state(kNumMediaStreamTypes, kNotRequested) { 418 state(kNumMediaStreamTypes, kNotRequested) {
417 DCHECK(requester); 419 DCHECK(requester);
418 } 420 }
419 421
420 MediaStreamManager::DeviceRequest::~DeviceRequest() {} 422 MediaStreamManager::DeviceRequest::~DeviceRequest() {}
421 423
422 } // namespace media_stream 424 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698