mojo/shell/android/mojo_main.cc - Issue 213313004: Add creation of ServiceManager to Content (2nd try)

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 213313004: Add creation of ServiceManager to Content (2nd try) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add shell_client to mojo_pepper_container_app Created 6 years, 9 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 8419d30dc0e7bf42ed1d3735e091b7c972153778..a6eb580f0b97e12601e8986891f105d2654b8889 100644

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

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

@@ -46,6 +46,11 @@ class NativeViewportServiceLoader : public ServiceLoader {

app_.reset(CreateNativeViewportService(g_context.Get().get(),

service_handle.Pass()));

}

+ virtual void OnServiceError(ServiceManager* manager,

+ const GURL& url) OVERRIDE {

+ }

scoped_ptr<Application> app_;

};