content/browser/mojo/mojo_application_host.h - Issue 1858103002: Strawman proposal for dealing with Android java mojo services registry in browser code

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: content/browser/mojo/mojo_application_host.h

Issue 1858103002: Strawman proposal for dealing with Android java mojo services registry in browser code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tweak a couple more headers. Created 4 years, 8 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 | « content/browser/mojo/browser_service_registry_impl.h ('k') | content/browser/service_worker/embedded_worker_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/mojo/mojo_application_host.h

diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h

index f09c729e7d6607a97effe727b768c4821a9a8671..129baa3207fbe8bc076f500534edcf66c5d5d930 100644

--- a/content/browser/mojo/mojo_application_host.h

+++ b/content/browser/mojo/mojo_application_host.h

@@ -59,14 +59,10 @@ class CONTENT_EXPORT MojoApplicationHost {

bool did_activate_;

scoped_ptr<mojom::ApplicationSetup> application_setup_;

- ServiceRegistryImpl service_registry_;

+ BrowserServiceRegistryImpl service_registry_;

scoped_refptr<base::TaskRunner> io_task_runner_override_;

-#if defined(OS_ANDROID)

- scoped_ptr<ServiceRegistryAndroid> service_registry_android_;

-#endif

DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);

};

« no previous file with comments | « content/browser/mojo/browser_service_registry_impl.h ('k') | content/browser/service_worker/embedded_worker_instance.h » ('j') | no next file with comments »