mojo/public/cpp/application/lib/application_impl.cc - Issue 1682113003: Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>.

Unified Diff: mojo/public/cpp/application/lib/application_impl.cc

Issue 1682113003: Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« mojo/public/cpp/application/connect.h ('K') | « mojo/public/cpp/application/connect.h ('k') | mojo/public/cpp/application/lib/application_test_base.cc » ('j') | mojo/public/cpp/bindings/interface_handle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/cpp/application/lib/application_impl.cc

diff --git a/mojo/public/cpp/application/lib/application_impl.cc b/mojo/public/cpp/application/lib/application_impl.cc

index 569bca0c38a4adec497cfcf96f4baea2d7ebc48f..35947172a432e4c139991ea045ed8c2865d9ff48 100644

--- a/mojo/public/cpp/application/lib/application_impl.cc

+++ b/mojo/public/cpp/application/lib/application_impl.cc

@@ -41,7 +41,7 @@ ApplicationConnection* ApplicationImpl::ConnectToApplication(

InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);

ServiceProviderPtr remote_services;

shell_->ConnectToApplication(application_url, GetProxy(&remote_services),

- local_services.Pass());

+ local_services.PassInterfaceHandle());

viettrungluu 2016/02/10 01:04:08 GetProxy argh.

vardhan 2016/02/11 22:47:53 Done.

internal::ServiceRegistry* registry = new internal::ServiceRegistry(

this, application_url, application_url, remote_services.Pass(),

local_request.Pass());

@@ -61,10 +61,10 @@ void ApplicationImpl::UnbindConnections(

shell->Bind(shell_.PassInterfaceHandle());

}

-void ApplicationImpl::Initialize(ShellPtr shell,

+void ApplicationImpl::Initialize(InterfaceHandle<Shell> shell,

Array<String> args,

const mojo::String& url) {

- shell_ = shell.Pass();

+ shell_ = ShellPtr::Create(shell.Pass());

viettrungluu 2016/02/10 01:04:08 std::move, instead of .Pass()?

vardhan 2016/02/11 22:47:53 Already done in patchset #2

shell_.set_connection_error_handler([this]() {

delegate_->Quit();

incoming_service_registries_.clear();

@@ -79,11 +79,13 @@ void ApplicationImpl::Initialize(ShellPtr shell,

void ApplicationImpl::AcceptConnection(

const String& requestor_url,

InterfaceRequest<ServiceProvider> services,

- ServiceProviderPtr exposed_services,

+ InterfaceHandle<ServiceProvider> exposed_services,

const String& url) {

std::unique_ptr<internal::ServiceRegistry> registry(

- new internal::ServiceRegistry(this, url, requestor_url,

- exposed_services.Pass(), services.Pass()));

+ new internal::ServiceRegistry(

+ this, url, requestor_url,

+ ServiceProviderPtr::Create(std::move(exposed_services)),

viettrungluu 2016/02/10 01:04:08 Possibly ServiceRegistry's ctor should take an Int

vardhan 2016/02/11 22:47:53 Done.

+ services.Pass()));

if (!delegate_->ConfigureIncomingConnection(registry.get()))

return;

incoming_service_registries_.push_back(std::move(registry));