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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 629523003: Rename Get to GetProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix device Created 6 years, 2 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 | « no previous file | device/serial/serial_connection_unittest.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } else { 199 } else {
200 rfh_state_ = STATE_DEFAULT; 200 rfh_state_ = STATE_DEFAULT;
201 GetSiteInstance()->increment_active_frame_count(); 201 GetSiteInstance()->increment_active_frame_count();
202 } 202 }
203 203
204 if (GetProcess()->GetServiceRegistry()) { 204 if (GetProcess()->GetServiceRegistry()) {
205 RenderFrameSetupPtr setup; 205 RenderFrameSetupPtr setup;
206 GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup); 206 GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup);
207 mojo::ServiceProviderPtr service_provider; 207 mojo::ServiceProviderPtr service_provider;
208 setup->GetServiceProviderForFrame(routing_id_, 208 setup->GetServiceProviderForFrame(routing_id_,
209 mojo::Get(&service_provider)); 209 mojo::GetProxy(&service_provider));
210 service_registry_.BindRemoteServiceProvider( 210 service_registry_.BindRemoteServiceProvider(
211 service_provider.PassMessagePipe()); 211 service_provider.PassMessagePipe());
212 } 212 }
213 213
214 swapout_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( 214 swapout_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind(
215 &RenderFrameHostImpl::OnSwappedOut, weak_ptr_factory_.GetWeakPtr()))); 215 &RenderFrameHostImpl::OnSwappedOut, weak_ptr_factory_.GetWeakPtr())));
216 } 216 }
217 217
218 RenderFrameHostImpl::~RenderFrameHostImpl() { 218 RenderFrameHostImpl::~RenderFrameHostImpl() {
219 GetProcess()->RemoveRoute(routing_id_); 219 GetProcess()->RemoveRoute(routing_id_);
(...skipping 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 // Clear any state if a pending navigation is canceled or preempted. 1541 // Clear any state if a pending navigation is canceled or preempted.
1542 if (suspended_nav_params_) 1542 if (suspended_nav_params_)
1543 suspended_nav_params_.reset(); 1543 suspended_nav_params_.reset();
1544 1544
1545 TRACE_EVENT_ASYNC_END0("navigation", 1545 TRACE_EVENT_ASYNC_END0("navigation",
1546 "RenderFrameHostImpl navigation suspended", this); 1546 "RenderFrameHostImpl navigation suspended", this);
1547 navigations_suspended_ = false; 1547 navigations_suspended_ = false;
1548 } 1548 }
1549 1549
1550 } // namespace content 1550 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | device/serial/serial_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698