mojo/shell/android/mojo_main.cc - Issue 298003008: Shell / ShellClient -> ServiceProvider

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/android/mojo_main.cc

Issue 298003008: Shell / ShellClient -> ServiceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: mojo/shell/android/mojo_main.cc

diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc

index 8abf733f5ad63cd135d3f4b3566c88be5c43f6ea..47f7f528552e6170529e97c58194ef1e46dad3f8 100644

--- a/mojo/shell/android/mojo_main.cc

+++ b/mojo/shell/android/mojo_main.cc

@@ -13,8 +13,8 @@

#include "base/macros.h"

#include "base/message_loop/message_loop.h"

#include "jni/MojoMain_jni.h"

+#include "mojo/public/cpp/application/application.h"

#include "mojo/public/cpp/environment/environment.h"

-#include "mojo/public/cpp/shell/application.h"

#include "mojo/service_manager/service_loader.h"

#include "mojo/service_manager/service_manager.h"

#include "mojo/shell/context.h"