mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc - 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/services/public/cpp/view_manager/tests/view_manager_unittest.cc

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: Follow review 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/application_manager/application_manager.cc ('K') | « mojo/application_manager/background_shell_application_loader_unittest.cc ('k') | mojo/services/view_manager/view_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

index 6c67dae02a24c048b77a448c25e3fc0c38a9f5be..375765d5fbf880a56c9b41fb9e92ca394b524154 100644

--- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

+++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

@@ -63,12 +63,11 @@ class ConnectApplicationLoader : public ApplicationLoader,

// Overridden from ApplicationLoader:

void Load(ApplicationManager* manager,

const GURL& url,

- scoped_refptr<LoadCallbacks> callbacks) override {

- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();

- if (!shell_handle.is_valid())

- return;

- scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this,

- shell_handle.Pass()));

+ ScopedMessagePipeHandle shell_handle,

+ LoadCallback callback) override {

+ ASSERT_TRUE(shell_handle.is_valid());

+ scoped_ptr<ApplicationImpl> app(

+ new ApplicationImpl(this, shell_handle.Pass()));

apps_.push_back(app.release());

}