mojo/shell/application_manager.cc - 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.cc

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.cc

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

index 44a0c0d410501711eeab625b5a592601ac0fb1f9..6ac56ec665b0a5c41f3ea69f1a5b4b653304cc99 100644

--- a/mojo/shell/application_manager.cc

+++ b/mojo/shell/application_manager.cc

@@ -41,7 +41,7 @@ class ApplicationManager::ContentHandlerConnection : public ErrorHandler {

GetProxy(&services), nullptr,

base::Closure());

MessagePipe pipe;

- content_handler_.Bind(pipe.handle0.Pass());

+ content_handler_.Bind(InterfacePtrInfo<ContentHandler>(pipe.handle0.Pass(), 0u));

sky 2015/05/08 19:08:02 nit: > 80.

Ken Rockot(use gerrit already) 2015/05/08 19:12:47 Fixed

services->ConnectToService(ContentHandler::Name_, pipe.handle1.Pass());

content_handler_.set_error_handler(this);

}

« no previous file with comments | « mojo/shell/application_manager.h ('k') | third_party/mojo/mojo_public.gyp » ('j') | no next file with comments »