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

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

Issue 138753004: Cast: IPC glue between cast library transport and encoders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged correctly (instead of incorrectly) Created 6 years, 10 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
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/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/renderer/content_settings_observer.h" 34 #include "chrome/renderer/content_settings_observer.h"
35 #include "chrome/renderer/extensions/chrome_v8_context.h" 35 #include "chrome/renderer/extensions/chrome_v8_context.h"
36 #include "chrome/renderer/extensions/chrome_v8_extension.h" 36 #include "chrome/renderer/extensions/chrome_v8_extension.h"
37 #include "chrome/renderer/extensions/dispatcher.h" 37 #include "chrome/renderer/extensions/dispatcher.h"
38 #include "chrome/renderer/extensions/extension_frame_helper.h" 38 #include "chrome/renderer/extensions/extension_frame_helper.h"
39 #include "chrome/renderer/extensions/extension_helper.h" 39 #include "chrome/renderer/extensions/extension_helper.h"
40 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" 40 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
41 #include "chrome/renderer/extensions/resource_request_policy.h" 41 #include "chrome/renderer/extensions/resource_request_policy.h"
42 #include "chrome/renderer/external_extension.h" 42 #include "chrome/renderer/external_extension.h"
43 #include "chrome/renderer/loadtimes_extension_bindings.h" 43 #include "chrome/renderer/loadtimes_extension_bindings.h"
44 #include "chrome/renderer/media/cast_ipc_dispatcher.h"
44 #include "chrome/renderer/media/chrome_key_systems.h" 45 #include "chrome/renderer/media/chrome_key_systems.h"
45 #include "chrome/renderer/net/net_error_helper.h" 46 #include "chrome/renderer/net/net_error_helper.h"
46 #include "chrome/renderer/net/prescient_networking_dispatcher.h" 47 #include "chrome/renderer/net/prescient_networking_dispatcher.h"
47 #include "chrome/renderer/net/renderer_net_predictor.h" 48 #include "chrome/renderer/net/renderer_net_predictor.h"
48 #include "chrome/renderer/net_benchmarking_extension.h" 49 #include "chrome/renderer/net_benchmarking_extension.h"
49 #include "chrome/renderer/page_load_histograms.h" 50 #include "chrome/renderer/page_load_histograms.h"
50 #include "chrome/renderer/pepper/pepper_helper.h" 51 #include "chrome/renderer/pepper/pepper_helper.h"
51 #include "chrome/renderer/pepper/ppb_pdf_impl.h" 52 #include "chrome/renderer/pepper/ppb_pdf_impl.h"
52 #include "chrome/renderer/playback_extension.h" 53 #include "chrome/renderer/playback_extension.h"
53 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h" 54 #include "chrome/renderer/plugins/chrome_plugin_placeholder.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave()); 255 visited_link_slave_.reset(new visitedlink::VisitedLinkSlave());
255 #if defined(FULL_SAFE_BROWSING) 256 #if defined(FULL_SAFE_BROWSING)
256 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create()); 257 phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
257 #endif 258 #endif
258 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher()); 259 prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());
259 #if defined(ENABLE_WEBRTC) 260 #if defined(ENABLE_WEBRTC)
260 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter( 261 webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter(
261 content::RenderThread::Get()->GetIOMessageLoopProxy()); 262 content::RenderThread::Get()->GetIOMessageLoopProxy());
262 #endif 263 #endif
263 search_bouncer_.reset(new SearchBouncer()); 264 search_bouncer_.reset(new SearchBouncer());
265 cast_dispatcher_ = new CastIPCDispatcher(
266 content::RenderThread::Get()->GetIOMessageLoopProxy());
264 267
265 thread->AddObserver(chrome_observer_.get()); 268 thread->AddObserver(chrome_observer_.get());
266 thread->AddObserver(extension_dispatcher_.get()); 269 thread->AddObserver(extension_dispatcher_.get());
267 #if defined(FULL_SAFE_BROWSING) 270 #if defined(FULL_SAFE_BROWSING)
268 thread->AddObserver(phishing_classifier_.get()); 271 thread->AddObserver(phishing_classifier_.get());
269 #endif 272 #endif
270 thread->AddObserver(visited_link_slave_.get()); 273 thread->AddObserver(visited_link_slave_.get());
271 thread->AddObserver(prerender_dispatcher_.get()); 274 thread->AddObserver(prerender_dispatcher_.get());
272 thread->AddObserver(search_bouncer_.get()); 275 thread->AddObserver(search_bouncer_.get());
273 276
274 #if defined(ENABLE_WEBRTC) 277 #if defined(ENABLE_WEBRTC)
275 thread->AddFilter(webrtc_logging_message_filter_.get()); 278 thread->AddFilter(webrtc_logging_message_filter_.get());
276 #endif 279 #endif
280 thread->AddFilter(cast_dispatcher_.get());
277 281
278 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 282 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
279 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 283 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
280 284
281 CommandLine* command_line = CommandLine::ForCurrentProcess(); 285 CommandLine* command_line = CommandLine::ForCurrentProcess();
282 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 286 if (command_line->HasSwitch(switches::kEnableBenchmarking))
283 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 287 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
284 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) 288 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
285 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 289 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
286 if (command_line->HasSwitch(switches::kInstantProcess)) 290 if (command_line->HasSwitch(switches::kInstantProcess))
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1438 CommandLine* command_line = CommandLine::ForCurrentProcess();
1435 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); 1439 return !command_line->HasSwitch(extensions::switches::kExtensionProcess);
1436 } 1440 }
1437 1441
1438 blink::WebWorkerPermissionClientProxy* 1442 blink::WebWorkerPermissionClientProxy*
1439 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1443 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1440 content::RenderFrame* render_frame, 1444 content::RenderFrame* render_frame,
1441 blink::WebFrame* frame) { 1445 blink::WebFrame* frame) {
1442 return new WorkerPermissionClientProxy(render_frame, frame); 1446 return new WorkerPermissionClientProxy(render_frame, frame);
1443 } 1447 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698