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

Side by Side Diff: content/renderer/media/media_stream_impl.cc

Issue 9271061: Cleanup: Remove static storage for variables in an unnamed namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Style change. Created 8 years, 11 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
« no previous file with comments | « content/renderer/gpu/renderer_gl_context.cc ('k') | content/renderer/render_thread_impl.cc » ('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/renderer/media/media_stream_impl.h" 5 #include "content/renderer/media/media_stream_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 15 matching lines...) Expand all
26 #include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h" 26 #include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
27 #include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h" 27 #include "third_party/libjingle/source/talk/session/phone/dummydevicemanager.h"
28 #include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h" 28 #include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h"
30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h" 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistr y.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amSource.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amSource.h"
32 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" 32 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
33 33
34 namespace { 34 namespace {
35 35
36 static const int kVideoCaptureWidth = 352; 36 const int kVideoCaptureWidth = 352;
37 static const int kVideoCaptureHeight = 288; 37 const int kVideoCaptureHeight = 288;
38 static const int kVideoCaptureFramePerSecond = 30; 38 const int kVideoCaptureFramePerSecond = 30;
39 39
40 } // namespace 40 } // namespace
41 41
42 int MediaStreamImpl::next_request_id_ = 0; 42 int MediaStreamImpl::next_request_id_ = 0;
43 43
44 MediaStreamImpl::MediaStreamImpl( 44 MediaStreamImpl::MediaStreamImpl(
45 MediaStreamDispatcher* media_stream_dispatcher, 45 MediaStreamDispatcher* media_stream_dispatcher,
46 content::P2PSocketDispatcher* p2p_socket_dispatcher, 46 content::P2PSocketDispatcher* p2p_socket_dispatcher,
47 VideoCaptureImplManager* vc_manager, 47 VideoCaptureImplManager* vc_manager,
48 MediaStreamDependencyFactory* dependency_factory) 48 MediaStreamDependencyFactory* dependency_factory)
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true); 386 jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true);
387 *thread = jingle_glue::JingleThreadWrapper::current(); 387 *thread = jingle_glue::JingleThreadWrapper::current();
388 event->Signal(); 388 event->Signal();
389 } 389 }
390 390
391 void MediaStreamImpl::DeleteIpcNetworkManager() { 391 void MediaStreamImpl::DeleteIpcNetworkManager() {
392 DCHECK_EQ(MessageLoop::current(), chrome_worker_thread_.message_loop()); 392 DCHECK_EQ(MessageLoop::current(), chrome_worker_thread_.message_loop());
393 delete network_manager_; 393 delete network_manager_;
394 network_manager_ = NULL; 394 network_manager_ = NULL;
395 } 395 }
OLDNEW
« no previous file with comments | « content/renderer/gpu/renderer_gl_context.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698