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

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: Code review. 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 "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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 new extensions::RendererPermissionsPolicyDelegate( 220 new extensions::RendererPermissionsPolicyDelegate(
217 extension_dispatcher_.get())); 221 extension_dispatcher_.get()));
218 prescient_networking_dispatcher_.reset(new PrescientNetworkingDispatcher()); 222 prescient_networking_dispatcher_.reset(new PrescientNetworkingDispatcher());
219 net_predictor_.reset(new RendererNetPredictor()); 223 net_predictor_.reset(new RendererNetPredictor());
220 spellcheck_.reset(new SpellCheck()); 224 spellcheck_.reset(new SpellCheck());
221 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); 225 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave());
222 #if defined(FULL_SAFE_BROWSING) 226 #if defined(FULL_SAFE_BROWSING)
223 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); 227 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
224 #endif 228 #endif
225 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); 229 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());
230 #if defined(ENABLE_WEBRTC)
231 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter(
232 content::RenderThread::Get()->GetIOMessageLoopProxy());
233 #endif
226 234
227 RenderThread* thread = RenderThread::Get(); 235 RenderThread* thread = RenderThread::Get();
228 236
229 thread->AddObserver(chrome_observer_.get()); 237 thread->AddObserver(chrome_observer_.get());
230 thread->AddObserver(extension_dispatcher_.get()); 238 thread->AddObserver(extension_dispatcher_.get());
231 #if defined(FULL_SAFE_BROWSING) 239 #if defined(FULL_SAFE_BROWSING)
232 thread->AddObserver(phishing_classifier_.get()); 240 thread->AddObserver(phishing_classifier_.get());
233 #endif 241 #endif
234 thread->AddObserver(spellcheck_.get()); 242 thread->AddObserver(spellcheck_.get());
235 thread->AddObserver(visited_link_slave_.get()); 243 thread->AddObserver(visited_link_slave_.get());
236 thread->AddObserver(prerender_dispatcher_.get()); 244 thread->AddObserver(prerender_dispatcher_.get());
237 245
246 #if defined(ENABLE_WEBRTC)
247 thread->AddFilter(webrtc_logging_message_filter_.get());
248 #endif
249
238 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 250 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
239 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 251 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
240 252
241 CommandLine* command_line = CommandLine::ForCurrentProcess(); 253 CommandLine* command_line = CommandLine::ForCurrentProcess();
242 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 254 if (command_line->HasSwitch(switches::kEnableBenchmarking))
243 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 255 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
244 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) 256 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
245 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 257 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
246 if (command_line->HasSwitch(switches::kInstantProcess)) 258 if (command_line->HasSwitch(switches::kInstantProcess))
247 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 259 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1180 1192
1181 if (container->element().shadowHost().isNull()) 1193 if (container->element().shadowHost().isNull())
1182 return false; 1194 return false;
1183 1195
1184 WebString tag_name = container->element().shadowHost().tagName(); 1196 WebString tag_name = container->element().shadowHost().tagName();
1185 return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) || 1197 return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) ||
1186 tag_name.equals(WebString::fromUTF8(kAdViewTagName)); 1198 tag_name.equals(WebString::fromUTF8(kAdViewTagName));
1187 } 1199 }
1188 1200
1189 } // namespace chrome 1201 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698