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

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

Issue 2705503002: Mojo C++ bindings: rename GetIsolatedProxy to MakeIsolatedRequest to better match other functions. (Closed)
Patch Set: . Created 3 years, 9 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 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 <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 mojom::AssociatedInterfaceProviderAssociatedPtr remote_interfaces; 606 mojom::AssociatedInterfaceProviderAssociatedPtr remote_interfaces;
607 IPC::ChannelProxy* channel = GetProcess()->GetChannel(); 607 IPC::ChannelProxy* channel = GetProcess()->GetChannel();
608 if (channel) { 608 if (channel) {
609 RenderProcessHostImpl* process = 609 RenderProcessHostImpl* process =
610 static_cast<RenderProcessHostImpl*>(GetProcess()); 610 static_cast<RenderProcessHostImpl*>(GetProcess());
611 process->GetRemoteRouteProvider()->GetRoute( 611 process->GetRemoteRouteProvider()->GetRoute(
612 GetRoutingID(), mojo::MakeRequest(&remote_interfaces)); 612 GetRoutingID(), mojo::MakeRequest(&remote_interfaces));
613 } else { 613 } else {
614 // The channel may not be initialized in some tests environments. In this 614 // The channel may not be initialized in some tests environments. In this
615 // case we set up a dummy interface provider. 615 // case we set up a dummy interface provider.
616 mojo::GetIsolatedProxy(&remote_interfaces); 616 mojo::MakeIsolatedRequest(&remote_interfaces);
617 } 617 }
618 remote_associated_interfaces_.reset(new AssociatedInterfaceProviderImpl( 618 remote_associated_interfaces_.reset(new AssociatedInterfaceProviderImpl(
619 std::move(remote_interfaces))); 619 std::move(remote_interfaces)));
620 } 620 }
621 return remote_associated_interfaces_.get(); 621 return remote_associated_interfaces_.get();
622 } 622 }
623 623
624 blink::WebPageVisibilityState RenderFrameHostImpl::GetVisibilityState() { 624 blink::WebPageVisibilityState RenderFrameHostImpl::GetVisibilityState() {
625 // Works around the crashes seen in https://crbug.com/501863, where the 625 // Works around the crashes seen in https://crbug.com/501863, where the
626 // active WebContents from a browser iterator may contain a render frame 626 // active WebContents from a browser iterator may contain a render frame
(...skipping 2925 matching lines...) Expand 10 before | Expand all | Expand 10 after
3552 service_manager::mojom::InterfaceProviderPtr provider; 3552 service_manager::mojom::InterfaceProviderPtr provider;
3553 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this); 3553 BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
3554 java_interfaces_.reset(new service_manager::InterfaceProvider); 3554 java_interfaces_.reset(new service_manager::InterfaceProvider);
3555 java_interfaces_->Bind(std::move(provider)); 3555 java_interfaces_->Bind(std::move(provider));
3556 } 3556 }
3557 return java_interfaces_.get(); 3557 return java_interfaces_.get();
3558 } 3558 }
3559 #endif 3559 #endif
3560 3560
3561 } // namespace content 3561 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/dom_storage/local_storage_context_mojo.cc ('k') | content/child/indexed_db/webidbcursor_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698