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

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: Fixed some errors. 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "ui/base/l10n/l10n_util.h" 93 #include "ui/base/l10n/l10n_util.h"
94 #include "ui/base/layout.h" 94 #include "ui/base/layout.h"
95 #include "ui/base/resource/resource_bundle.h" 95 #include "ui/base/resource/resource_bundle.h"
96 #include "ui/webui/jstemplate_builder.h" 96 #include "ui/webui/jstemplate_builder.h"
97 #include "webkit/plugins/npapi/plugin_list.h" 97 #include "webkit/plugins/npapi/plugin_list.h"
98 #include "webkit/plugins/ppapi/plugin_module.h" 98 #include "webkit/plugins/ppapi/plugin_module.h"
99 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 99 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
100 100
101 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 101 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
102 102
103 #if defined(ENABLE_WEBRTC)
104 #include "chrome/renderer/media/webrtc_logging_message_filter.h"
105 #endif
106
103 using autofill::AutofillAgent; 107 using autofill::AutofillAgent;
104 using autofill::PasswordAutofillAgent; 108 using autofill::PasswordAutofillAgent;
105 using autofill::PasswordGenerationManager; 109 using autofill::PasswordGenerationManager;
106 using content::RenderThread; 110 using content::RenderThread;
107 using extensions::Extension; 111 using extensions::Extension;
108 using WebKit::WebCache; 112 using WebKit::WebCache;
109 using WebKit::WebConsoleMessage; 113 using WebKit::WebConsoleMessage;
110 using WebKit::WebDataSource; 114 using WebKit::WebDataSource;
111 using WebKit::WebDocument; 115 using WebKit::WebDocument;
112 using WebKit::WebFrame; 116 using WebKit::WebFrame;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 permissions_policy_delegate_.reset( 219 permissions_policy_delegate_.reset(
216 new extensions::RendererPermissionsPolicyDelegate()); 220 new extensions::RendererPermissionsPolicyDelegate());
217 prescient_networking_dispatcher_.reset(new PrescientNetworkingDispatcher()); 221 prescient_networking_dispatcher_.reset(new PrescientNetworkingDispatcher());
218 net_predictor_.reset(new RendererNetPredictor()); 222 net_predictor_.reset(new RendererNetPredictor());
219 spellcheck_.reset(new SpellCheck()); 223 spellcheck_.reset(new SpellCheck());
220 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); 224 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave());
221 #if defined(FULL_SAFE_BROWSING) 225 #if defined(FULL_SAFE_BROWSING)
222 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); 226 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
223 #endif 227 #endif
224 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); 228 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());
229 #if defined(ENABLE_WEBRTC)
230 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter(
231 content::RenderThread::Get()->GetIOMessageLoopProxy());
232 #endif
225 233
226 RenderThread* thread = RenderThread::Get(); 234 RenderThread* thread = RenderThread::Get();
227 235
228 thread->AddObserver(chrome_observer_.get()); 236 thread->AddObserver(chrome_observer_.get());
229 thread->AddObserver(extension_dispatcher_.get()); 237 thread->AddObserver(extension_dispatcher_.get());
230 #if defined(FULL_SAFE_BROWSING) 238 #if defined(FULL_SAFE_BROWSING)
231 thread->AddObserver(phishing_classifier_.get()); 239 thread->AddObserver(phishing_classifier_.get());
232 #endif 240 #endif
233 thread->AddObserver(spellcheck_.get()); 241 thread->AddObserver(spellcheck_.get());
234 thread->AddObserver(visited_link_slave_.get()); 242 thread->AddObserver(visited_link_slave_.get());
235 thread->AddObserver(prerender_dispatcher_.get()); 243 thread->AddObserver(prerender_dispatcher_.get());
236 244
245 #if defined(ENABLE_WEBRTC)
246 thread->AddFilter(webrtc_logging_message_filter_.get());
247 #endif
248
237 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 249 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
238 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 250 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
239 251
240 CommandLine* command_line = CommandLine::ForCurrentProcess(); 252 CommandLine* command_line = CommandLine::ForCurrentProcess();
241 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 253 if (command_line->HasSwitch(switches::kEnableBenchmarking))
242 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 254 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
243 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) 255 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
244 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 256 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
245 if (command_line->HasSwitch(switches::kInstantProcess)) 257 if (command_line->HasSwitch(switches::kInstantProcess))
246 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 258 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 1188
1177 if (container->element().shadowHost().isNull()) 1189 if (container->element().shadowHost().isNull())
1178 return false; 1190 return false;
1179 1191
1180 WebString tag_name = container->element().shadowHost().tagName(); 1192 WebString tag_name = container->element().shadowHost().tagName();
1181 return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) || 1193 return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) ||
1182 tag_name.equals(WebString::fromUTF8(kAdViewTagName)); 1194 tag_name.equals(WebString::fromUTF8(kAdViewTagName));
1183 } 1195 }
1184 1196
1185 } // namespace chrome 1197 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698