mojo/shell/application_manager.h - Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/shell/application_manager.h

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge IPC fixes Created 5 years, 7 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

Index: mojo/shell/application_manager.h

diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h

index 5be3a41d5ab1fa74337254468541bf7400855abd..93a66bbbbc6f2a7c79b240b447bc7570169c55b1 100644

--- a/mojo/shell/application_manager.h

+++ b/mojo/shell/application_manager.h

@@ -11,6 +11,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

#include "base/memory/weak_ptr.h"

+#include "mojo/public/cpp/bindings/interface_ptr_info.h"

#include "mojo/public/cpp/bindings/interface_request.h"

#include "mojo/public/interfaces/application/application.mojom.h"

#include "mojo/public/interfaces/application/service_provider.mojom.h"

@@ -79,7 +80,7 @@ class ApplicationManager {

InterfacePtr<Interface>* ptr) {

ScopedMessagePipeHandle service_handle =

ConnectToServiceByName(application_url, Interface::Name_);

- ptr->Bind(service_handle.Pass());

+ ptr->Bind(InterfacePtrInfo<Interface>(service_handle.Pass(), 0u));

}

ScopedMessagePipeHandle ConnectToServiceByName(

« no previous file with comments | « mojo/runner/shell_test_base.h ('k') | mojo/shell/application_manager.cc » ('j') | mojo/shell/application_manager.cc » ('J')