mojo/shell/ui_application_loader_android.h - Issue 741453002: Make sure that Content Handled application can be connected multiple times.

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/ui_application_loader_android.h

Issue 741453002: Make sure that Content Handled application can be connected multiple times. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years, 1 month 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

« mojo/shell/dynamic_application_loader.cc ('K') | « mojo/shell/network_application_loader.cc ('k') | mojo/shell/ui_application_loader_android.cc » ('j') | sky/viewer/content_handler_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/shell/ui_application_loader_android.h

diff --git a/mojo/shell/ui_application_loader_android.h b/mojo/shell/ui_application_loader_android.h

index 9b8841071e70b1987a65efca06a80e839bd4af01..e4d477248665f95de7004f874504d369604fb567 100644

--- a/mojo/shell/ui_application_loader_android.h

+++ b/mojo/shell/ui_application_loader_android.h

@@ -29,6 +29,7 @@ class UIApplicationLoader : public ApplicationLoader {

// ApplicationLoader overrides:

void Load(ApplicationManager* manager,

const GURL& url,

+ ScopedMessagePipeHandle shell_handle,

scoped_refptr<LoadCallbacks> callbacks) override;

void OnApplicationError(ApplicationManager* manager,

const GURL& url) override;

@@ -42,7 +43,7 @@ class UIApplicationLoader : public ApplicationLoader {

// isn't thread safe).

void LoadOnUIThread(ApplicationManager* manager,

const GURL& url,

- ScopedMessagePipeHandle* shell_handle);

+ ScopedMessagePipeHandle shell_handle);

void OnApplicationErrorOnUIThread(ApplicationManager* manager,

const GURL& url);

void ShutdownOnUIThread();

@@ -50,9 +51,6 @@ class UIApplicationLoader : public ApplicationLoader {

scoped_ptr<ApplicationLoader> loader_;

shell::Context* context_;

- // Lives on the UI thread. Trivial interface that calls through to |loader_|.

- UILoader* ui_loader_;

DISALLOW_COPY_AND_ASSIGN(UIApplicationLoader);

};