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

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: Simplified test 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
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #endif 152 #endif
153 153
154 #if defined(OS_WIN) 154 #if defined(OS_WIN)
155 #include <windows.h> 155 #include <windows.h>
156 #include <objbase.h> 156 #include <objbase.h>
157 #else 157 #else
158 // TODO(port) 158 // TODO(port)
159 #include "content/child/npapi/np_channel_base.h" 159 #include "content/child/npapi/np_channel_base.h"
160 #endif 160 #endif
161 161
162 #if defined(ENABLE_EXTENSIONS)
163 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
164 #endif
165
162 #if defined(ENABLE_PLUGINS) 166 #if defined(ENABLE_PLUGINS)
163 #include "content/renderer/npapi/plugin_channel_host.h" 167 #include "content/renderer/npapi/plugin_channel_host.h"
164 #endif 168 #endif
165 169
166 #if defined(ENABLE_WEBRTC) 170 #if defined(ENABLE_WEBRTC)
167 #include "content/renderer/media/peer_connection_tracker.h" 171 #include "content/renderer/media/peer_connection_tracker.h"
168 #include "content/renderer/media/rtc_peer_connection_handler.h" 172 #include "content/renderer/media/rtc_peer_connection_handler.h"
169 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 173 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
170 #include "content/renderer/media/webrtc_identity_service.h" 174 #include "content/renderer/media/webrtc_identity_service.h"
171 #endif 175 #endif
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher()); 471 embedded_worker_dispatcher_.reset(new EmbeddedWorkerDispatcher());
468 472
469 media_stream_center_ = NULL; 473 media_stream_center_ = NULL;
470 474
471 db_message_filter_ = new DBMessageFilter(); 475 db_message_filter_ = new DBMessageFilter();
472 AddFilter(db_message_filter_.get()); 476 AddFilter(db_message_filter_.get());
473 477
474 vc_manager_.reset(new VideoCaptureImplManager()); 478 vc_manager_.reset(new VideoCaptureImplManager());
475 AddFilter(vc_manager_->video_capture_message_filter()); 479 AddFilter(vc_manager_->video_capture_message_filter());
476 480
481 #if defined(ENABLE_EXTENSIONS)
482 browser_plugin_manager_.reset(new BrowserPluginManager());
483 AddObserver(browser_plugin_manager_.get());
484 #endif
485
477 #if defined(ENABLE_WEBRTC) 486 #if defined(ENABLE_WEBRTC)
478 peer_connection_tracker_.reset(new PeerConnectionTracker()); 487 peer_connection_tracker_.reset(new PeerConnectionTracker());
479 AddObserver(peer_connection_tracker_.get()); 488 AddObserver(peer_connection_tracker_.get());
480 489
481 p2p_socket_dispatcher_ = 490 p2p_socket_dispatcher_ =
482 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); 491 new P2PSocketDispatcher(GetIOMessageLoopProxy().get());
483 AddFilter(p2p_socket_dispatcher_.get()); 492 AddFilter(p2p_socket_dispatcher_.get());
484 493
485 webrtc_identity_service_.reset(new WebRTCIdentityService()); 494 webrtc_identity_service_.reset(new WebRTCIdentityService());
486 495
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 hidden_widget_count_--; 1735 hidden_widget_count_--;
1727 1736
1728 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 1737 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
1729 return; 1738 return;
1730 } 1739 }
1731 1740
1732 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 1741 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
1733 } 1742 }
1734 1743
1735 } // namespace content 1744 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698