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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 801173002: Fix message routing for BrowserPlugin in iframe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests that don't have a RenderThreadImpl Created 6 years 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
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "content/common/view_messages.h" 67 #include "content/common/view_messages.h"
68 #include "content/common/worker_messages.h" 68 #include "content/common/worker_messages.h"
69 #include "content/public/common/content_constants.h" 69 #include "content/public/common/content_constants.h"
70 #include "content/public/common/content_paths.h" 70 #include "content/public/common/content_paths.h"
71 #include "content/public/common/content_switches.h" 71 #include "content/public/common/content_switches.h"
72 #include "content/public/common/renderer_preferences.h" 72 #include "content/public/common/renderer_preferences.h"
73 #include "content/public/common/url_constants.h" 73 #include "content/public/common/url_constants.h"
74 #include "content/public/renderer/content_renderer_client.h" 74 #include "content/public/renderer/content_renderer_client.h"
75 #include "content/public/renderer/render_process_observer.h" 75 #include "content/public/renderer/render_process_observer.h"
76 #include "content/public/renderer/render_view_visitor.h" 76 #include "content/public/renderer/render_view_visitor.h"
77 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
77 #include "content/renderer/devtools/devtools_agent_filter.h" 78 #include "content/renderer/devtools/devtools_agent_filter.h"
78 #include "content/renderer/devtools/v8_sampling_profiler.h" 79 #include "content/renderer/devtools/v8_sampling_profiler.h"
79 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" 80 #include "content/renderer/dom_storage/dom_storage_dispatcher.h"
80 #include "content/renderer/dom_storage/webstoragearea_impl.h" 81 #include "content/renderer/dom_storage/webstoragearea_impl.h"
81 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 82 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
82 #include "content/renderer/gpu/compositor_external_begin_frame_source.h" 83 #include "content/renderer/gpu/compositor_external_begin_frame_source.h"
83 #include "content/renderer/gpu/compositor_forwarding_message_filter.h" 84 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
84 #include "content/renderer/gpu/compositor_output_surface.h" 85 #include "content/renderer/gpu/compositor_output_surface.h"
85 #include "content/renderer/input/input_event_filter.h" 86 #include "content/renderer/input/input_event_filter.h"
86 #include "content/renderer/input/input_handler_manager.h" 87 #include "content/renderer/input/input_handler_manager.h"
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher()); 468 embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher());
468 469
469 media_stream_center_ = NULL; 470 media_stream_center_ = NULL;
470 471
471 db_message_filter_ = new DBMessageFilter(); 472 db_message_filter_ = new DBMessageFilter();
472 AddFilter(db_message_filter_.get()); 473 AddFilter(db_message_filter_.get());
473 474
474 vc_manager_.reset(new VideoCaptureImplManager()); 475 vc_manager_.reset(new VideoCaptureImplManager());
475 AddFilter(vc_manager_->video_capture_message_filter()); 476 AddFilter(vc_manager_->video_capture_message_filter());
476 477
478 browser_plugin_manager_.reset(new BrowserPluginManager());
479 AddObserver(browser_plugin_manager_.get());
480
477 #if defined(ENABLE_WEBRTC) 481 #if defined(ENABLE_WEBRTC)
478 peer_connection_tracker_.reset(new PeerConnectionTracker()); 482 peer_connection_tracker_.reset(new PeerConnectionTracker());
479 AddObserver(peer_connection_tracker_.get()); 483 AddObserver(peer_connection_tracker_.get());
480 484
481 p2p_socket_dispatcher_ = 485 p2p_socket_dispatcher_ =
482 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); 486 new P2PSocketDispatcher(GetIOMessageLoopProxy().get());
483 AddFilter(p2p_socket_dispatcher_.get()); 487 AddFilter(p2p_socket_dispatcher_.get());
484 488
485 webrtc_identity_service_.reset(new WebRTCIdentityService()); 489 webrtc_identity_service_.reset(new WebRTCIdentityService());
486 490
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 hidden_widget_count_--; 1730 hidden_widget_count_--;
1727 1731
1728 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1732 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1729 return; 1733 return;
1730 } 1734 }
1731 1735
1732 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1736 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1733 } 1737 }
1734 1738
1735 } // namespace content 1739 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698