third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java - 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: third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java

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

Patch Set: formatting 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

« no previous file with comments | « third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationDelegate.java ('k') | third_party/mojo/src/mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java

diff --git a/third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java b/third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java

index 2676f38dc67fc83b49baaf14d6b6a8a422b3c9ca..7768b8dfe98fd26b667dd506f199bc6843b03732 100644

--- a/third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java

+++ b/third_party/mojo/src/mojo/public/java/application/src/org/chromium/mojo/application/ApplicationImpl.java

@@ -42,8 +42,7 @@ class ApplicationImpl implements Application {

ServiceProvider exposedServices, String connectionUrl) {

ApplicationConnection connection =

new ApplicationConnection(requestorUrl, exposedServices, connectionUrl);

- if (services != null

- && mApplicationDelegate.configureIncomingConnection(requestorUrl, connection)) {

+ if (services != null && mApplicationDelegate.configureIncomingConnection(connection)) {

ServiceProvider.MANAGER.bind(connection.getLocalServiceProvider(), services);

mIncomingConnections.add(connection);

} else {