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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 15741003: Moving WebRTC logging related files from content to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 6 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/render_thread_impl.h ('k') | third_party/libjingle/libjingle.gyp » ('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/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "content/renderer/gpu/gpu_benchmarking_extension.h" 58 #include "content/renderer/gpu/gpu_benchmarking_extension.h"
59 #include "content/renderer/gpu/input_handler_manager.h" 59 #include "content/renderer/gpu/input_handler_manager.h"
60 #include "content/renderer/media/audio_input_message_filter.h" 60 #include "content/renderer/media/audio_input_message_filter.h"
61 #include "content/renderer/media/audio_message_filter.h" 61 #include "content/renderer/media/audio_message_filter.h"
62 #include "content/renderer/media/audio_renderer_mixer_manager.h" 62 #include "content/renderer/media/audio_renderer_mixer_manager.h"
63 #include "content/renderer/media/media_stream_center.h" 63 #include "content/renderer/media/media_stream_center.h"
64 #include "content/renderer/media/media_stream_dependency_factory.h" 64 #include "content/renderer/media/media_stream_dependency_factory.h"
65 #include "content/renderer/media/peer_connection_tracker.h" 65 #include "content/renderer/media/peer_connection_tracker.h"
66 #include "content/renderer/media/video_capture_impl_manager.h" 66 #include "content/renderer/media/video_capture_impl_manager.h"
67 #include "content/renderer/media/video_capture_message_filter.h" 67 #include "content/renderer/media/video_capture_message_filter.h"
68 #include "content/renderer/media/webrtc_logging_message_filter.h"
69 #include "content/renderer/memory_benchmarking_extension.h" 68 #include "content/renderer/memory_benchmarking_extension.h"
70 #include "content/renderer/p2p/socket_dispatcher.h" 69 #include "content/renderer/p2p/socket_dispatcher.h"
71 #include "content/renderer/plugin_channel_host.h" 70 #include "content/renderer/plugin_channel_host.h"
72 #include "content/renderer/render_process_impl.h" 71 #include "content/renderer/render_process_impl.h"
73 #include "content/renderer/render_view_impl.h" 72 #include "content/renderer/render_view_impl.h"
74 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 73 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
75 #include "content/renderer/skia_benchmarking_extension.h" 74 #include "content/renderer/skia_benchmarking_extension.h"
76 #include "grit/content_resources.h" 75 #include "grit/content_resources.h"
77 #include "ipc/ipc_channel_handle.h" 76 #include "ipc/ipc_channel_handle.h"
78 #include "ipc/ipc_forwarding_message_filter.h" 77 #include "ipc/ipc_forwarding_message_filter.h"
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 381
383 audio_input_message_filter_ = 382 audio_input_message_filter_ =
384 new AudioInputMessageFilter(GetIOMessageLoopProxy()); 383 new AudioInputMessageFilter(GetIOMessageLoopProxy());
385 AddFilter(audio_input_message_filter_.get()); 384 AddFilter(audio_input_message_filter_.get());
386 385
387 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); 386 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy());
388 AddFilter(audio_message_filter_.get()); 387 AddFilter(audio_message_filter_.get());
389 388
390 AddFilter(new IndexedDBMessageFilter); 389 AddFilter(new IndexedDBMessageFilter);
391 390
392 #if defined(ENABLE_WEBRTC)
393 webrtc_logging_message_filter_ =
394 new WebRtcLoggingMessageFilter(GetIOMessageLoopProxy());
395 AddFilter(webrtc_logging_message_filter_.get());
396 #endif
397
398 GetContentClient()->renderer()->RenderThreadStarted(); 391 GetContentClient()->renderer()->RenderThreadStarted();
399 392
400 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 393 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
401 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) 394 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking))
402 RegisterExtension(GpuBenchmarkingExtension::Get()); 395 RegisterExtension(GpuBenchmarkingExtension::Get());
403 396
404 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) 397 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID))
405 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) 398 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking))
406 RegisterExtension(MemoryBenchmarkingExtension::Get()); 399 RegisterExtension(MemoryBenchmarkingExtension::Get());
407 #endif // USE_TCMALLOC 400 #endif // USE_TCMALLOC
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1341 1334
1342 void RenderThreadImpl::SetFlingCurveParameters( 1335 void RenderThreadImpl::SetFlingCurveParameters(
1343 const std::vector<float>& new_touchpad, 1336 const std::vector<float>& new_touchpad,
1344 const std::vector<float>& new_touchscreen) { 1337 const std::vector<float>& new_touchscreen) {
1345 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, 1338 webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
1346 new_touchscreen); 1339 new_touchscreen);
1347 1340
1348 } 1341 }
1349 1342
1350 } // namespace content 1343 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698