components/mus/public/cpp/lib/window_tree_host_factory.cc - Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

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: components/mus/public/cpp/lib/window_tree_host_factory.cc

Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom

Patch Set: . Created 4 years, 10 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 | « components/mus/public/cpp/lib/window_tree_client_impl.cc ('k') | components/mus/public/cpp/tests/window_server_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/mus/public/cpp/lib/window_tree_host_factory.cc

diff --git a/components/mus/public/cpp/lib/window_tree_host_factory.cc b/components/mus/public/cpp/lib/window_tree_host_factory.cc

index 77cf6de440e45315fec9d0c2c7f1c315f5ad2973..a475686d21a8c7e449c1861abd3c5b7dbb7ad7c1 100644

--- a/components/mus/public/cpp/lib/window_tree_host_factory.cc

+++ b/components/mus/public/cpp/lib/window_tree_host_factory.cc

@@ -6,7 +6,7 @@

#include "components/mus/public/cpp/window_tree_connection.h"

#include "components/mus/public/cpp/window_tree_delegate.h"

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

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

namespace mus {

@@ -22,12 +22,12 @@ void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory,

factory->CreateWindowTreeHost(GetProxy(host), std::move(tree_client));

}

-void CreateWindowTreeHost(mojo::ApplicationImpl* app,

+void CreateWindowTreeHost(mojo::Shell* shell,

WindowTreeDelegate* delegate,

mojom::WindowTreeHostPtr* host,

WindowManagerDelegate* window_manager_delegate) {

mojom::WindowTreeHostFactoryPtr factory;

- app->ConnectToService("mojo:mus", &factory);

+ shell->ConnectToService("mojo:mus", &factory);

CreateWindowTreeHost(factory.get(), delegate, host, window_manager_delegate);

}