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

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: Fixed handler unit test. 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
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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 379
381 audio_input_message_filter_ = 380 audio_input_message_filter_ =
382 new AudioInputMessageFilter(GetIOMessageLoopProxy()); 381 new AudioInputMessageFilter(GetIOMessageLoopProxy());
383 AddFilter(audio_input_message_filter_.get()); 382 AddFilter(audio_input_message_filter_.get());
384 383
385 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy()); 384 audio_message_filter_ = new AudioMessageFilter(GetIOMessageLoopProxy());
386 AddFilter(audio_message_filter_.get()); 385 AddFilter(audio_message_filter_.get());
387 386
388 AddFilter(new IndexedDBMessageFilter); 387 AddFilter(new IndexedDBMessageFilter);
389 388
390 #if defined(ENABLE_WEBRTC)
391 webrtc_logging_message_filter_ =
392 new WebRtcLoggingMessageFilter(GetIOMessageLoopProxy());
393 AddFilter(webrtc_logging_message_filter_.get());
394 #endif
395
396 GetContentClient()->renderer()->RenderThreadStarted(); 389 GetContentClient()->renderer()->RenderThreadStarted();
397 390
398 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 391 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
399 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking)) 392 if (command_line.HasSwitch(switches::kEnableGpuBenchmarking))
400 RegisterExtension(GpuBenchmarkingExtension::Get()); 393 RegisterExtension(GpuBenchmarkingExtension::Get());
401 394
402 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID)) 395 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID))
403 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) 396 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking))
404 RegisterExtension(MemoryBenchmarkingExtension::Get()); 397 RegisterExtension(MemoryBenchmarkingExtension::Get());
405 #endif // USE_TCMALLOC 398 #endif // USE_TCMALLOC
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 1323
1331 void RenderThreadImpl::SetFlingCurveParameters( 1324 void RenderThreadImpl::SetFlingCurveParameters(
1332 const std::vector<float>& new_touchpad, 1325 const std::vector<float>& new_touchpad,
1333 const std::vector<float>& new_touchscreen) { 1326 const std::vector<float>& new_touchscreen) {
1334 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, 1327 webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
1335 new_touchscreen); 1328 new_touchscreen);
1336 1329
1337 } 1330 }
1338 1331
1339 } // namespace content 1332 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698