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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 15741003: Moving WebRTC logging related files from content to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Public content API for setting the log delegate. Created 7 years, 7 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 "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #include "webkit/plugins/npapi/plugin_list.h" 96 #include "webkit/plugins/npapi/plugin_list.h"
97 #include "webkit/plugins/ppapi/plugin_module.h" 97 #include "webkit/plugins/ppapi/plugin_module.h"
98 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 98 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
99 99
100 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 100 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
101 101
102 #if defined(ENABLE_AUTOMATION) 102 #if defined(ENABLE_AUTOMATION)
103 #include "chrome/renderer/automation/automation_renderer_helper.h" 103 #include "chrome/renderer/automation/automation_renderer_helper.h"
104 #endif 104 #endif
105 105
106 #if defined(ENABLE_WEBRTC)
107 #include "chrome/renderer/media/webrtc_logging_handler_impl.h"
108 #include "chrome/renderer/media/webrtc_logging_message_filter.h"
109 #endif
110
106 using autofill::AutofillAgent; 111 using autofill::AutofillAgent;
107 using autofill::PasswordAutofillAgent; 112 using autofill::PasswordAutofillAgent;
108 using autofill::PasswordGenerationManager; 113 using autofill::PasswordGenerationManager;
109 using content::RenderThread; 114 using content::RenderThread;
110 using extensions::Extension; 115 using extensions::Extension;
111 using WebKit::WebCache; 116 using WebKit::WebCache;
112 using WebKit::WebConsoleMessage; 117 using WebKit::WebConsoleMessage;
113 using WebKit::WebDataSource; 118 using WebKit::WebDataSource;
114 using WebKit::WebDocument; 119 using WebKit::WebDocument;
115 using WebKit::WebFrame; 120 using WebKit::WebFrame;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 extension_dispatcher_.reset(new extensions::Dispatcher()); 222 extension_dispatcher_.reset(new extensions::Dispatcher());
218 permissions_policy_delegate_.reset( 223 permissions_policy_delegate_.reset(
219 new extensions::RendererPermissionsPolicyDelegate()); 224 new extensions::RendererPermissionsPolicyDelegate());
220 net_predictor_.reset(new RendererNetPredictor()); 225 net_predictor_.reset(new RendererNetPredictor());
221 spellcheck_.reset(new SpellCheck()); 226 spellcheck_.reset(new SpellCheck());
222 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); 227 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave());
223 #if defined(FULL_SAFE_BROWSING) 228 #if defined(FULL_SAFE_BROWSING)
224 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); 229 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
225 #endif 230 #endif
226 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); 231 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());
232 #if defined(ENABLE_WEBRTC)
233 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter(
234 content::RenderThread::Get()->GetIOMessageLoopProxy());
235 #endif
227 236
228 RenderThread* thread = RenderThread::Get(); 237 RenderThread* thread = RenderThread::Get();
229 238
230 thread->AddObserver(chrome_observer_.get()); 239 thread->AddObserver(chrome_observer_.get());
231 thread->AddObserver(extension_dispatcher_.get()); 240 thread->AddObserver(extension_dispatcher_.get());
232 #if defined(FULL_SAFE_BROWSING) 241 #if defined(FULL_SAFE_BROWSING)
233 thread->AddObserver(phishing_classifier_.get()); 242 thread->AddObserver(phishing_classifier_.get());
234 #endif 243 #endif
235 thread->AddObserver(spellcheck_.get()); 244 thread->AddObserver(spellcheck_.get());
236 thread->AddObserver(visited_link_slave_.get()); 245 thread->AddObserver(visited_link_slave_.get());
237 thread->AddObserver(prerender_dispatcher_.get()); 246 thread->AddObserver(prerender_dispatcher_.get());
238 247
248 #if defined(ENABLE_WEBRTC)
249 thread->AddFilter(webrtc_logging_message_filter_.get());
250 #endif
251
239 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 252 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
240 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 253 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
241 254
242 CommandLine* command_line = CommandLine::ForCurrentProcess(); 255 CommandLine* command_line = CommandLine::ForCurrentProcess();
243 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 256 if (command_line->HasSwitch(switches::kEnableBenchmarking))
244 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 257 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
245 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) 258 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
246 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 259 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
247 if (command_line->HasSwitch(switches::kInstantProcess)) 260 if (command_line->HasSwitch(switches::kInstantProcess))
248 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 261 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1178 return false; 1191 return false;
1179 1192
1180 if (container->element().shadowHost().isNull()) 1193 if (container->element().shadowHost().isNull())
1181 return false; 1194 return false;
1182 1195
1183 WebString tag_name = container->element().shadowHost().tagName(); 1196 WebString tag_name = container->element().shadowHost().tagName();
1184 return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) || 1197 return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) ||
1185 tag_name.equals(WebString::fromUTF8(kAdViewTagName)); 1198 tag_name.equals(WebString::fromUTF8(kAdViewTagName));
1186 } 1199 }
1187 1200
1201 #if defined(ENABLE_WEBRTC)
1202 void ChromeContentRendererClient::InitWebRtcLogging(
1203 const std::string& app_session_id) {
1204 RenderThread::Get()->GetIOMessageLoopProxy()->PostTask(
1205 FROM_HERE, base::Bind(
1206 &ChromeContentRendererClient::DoInitWebRtcLogging,
1207 base::Unretained(this),
1208 webrtc_logging_message_filter_,
1209 app_session_id));
1210 }
1211
1212 void ChromeContentRendererClient::DoInitWebRtcLogging(
1213 WebRtcLoggingMessageFilter* filter,
1214 const std::string& app_session_id) {
1215 WebRtcLoggingHandlerImpl* handler =
1216 new WebRtcLoggingHandlerImpl(filter->io_message_loop());
1217
1218 // TODO(grunell): Give app session id as parameter.
1219 filter->InitLogging(handler);
1220 }
1221 #endif
1222
1188 } // namespace chrome 1223 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698