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

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

Issue 1254883006: Bubble scroll events from WebView guest to embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Complete test. Created 5 years, 4 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
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_manager.cc ('k') | no next file » | 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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 media_stream_center_ = NULL; 692 media_stream_center_ = NULL;
693 693
694 db_message_filter_ = new DBMessageFilter(); 694 db_message_filter_ = new DBMessageFilter();
695 AddFilter(db_message_filter_.get()); 695 AddFilter(db_message_filter_.get());
696 696
697 vc_manager_.reset(new VideoCaptureImplManager()); 697 vc_manager_.reset(new VideoCaptureImplManager());
698 AddFilter(vc_manager_->video_capture_message_filter()); 698 AddFilter(vc_manager_->video_capture_message_filter());
699 699
700 browser_plugin_manager_.reset(new BrowserPluginManager()); 700 browser_plugin_manager_.reset(new BrowserPluginManager());
701 AddObserver(browser_plugin_manager_.get()); 701 AddObserver(browser_plugin_manager_.get());
702 browser_plugin_manager_->Init(GetIOMessageLoopProxy(), channel());
702 703
703 #if defined(ENABLE_WEBRTC) 704 #if defined(ENABLE_WEBRTC)
704 peer_connection_tracker_.reset(new PeerConnectionTracker()); 705 peer_connection_tracker_.reset(new PeerConnectionTracker());
705 AddObserver(peer_connection_tracker_.get()); 706 AddObserver(peer_connection_tracker_.get());
706 707
707 p2p_socket_dispatcher_ = 708 p2p_socket_dispatcher_ =
708 new P2PSocketDispatcher(GetIOMessageLoopProxy().get()); 709 new P2PSocketDispatcher(GetIOMessageLoopProxy().get());
709 AddFilter(p2p_socket_dispatcher_.get()); 710 AddFilter(p2p_socket_dispatcher_.get());
710 711
711 webrtc_identity_service_.reset(new WebRTCIdentityService()); 712 webrtc_identity_service_.reset(new WebRTCIdentityService());
(...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
2043 } 2044 }
2044 2045
2045 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2046 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2046 size_t erased = 2047 size_t erased =
2047 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2048 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2048 routing_id_); 2049 routing_id_);
2049 DCHECK_EQ(1u, erased); 2050 DCHECK_EQ(1u, erased);
2050 } 2051 }
2051 2052
2052 } // namespace content 2053 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698