| Index: components/mus/public/cpp/lib/view_tree_host_factory.cc
|
| diff --git a/components/mus/public/cpp/lib/view_tree_host_factory.cc b/components/mus/public/cpp/lib/view_tree_host_factory.cc
|
| index 62628667a2c0503e86026320338c158ce8f25956..1da65c941b2bf0f3484734db8a16f21f054fa96e 100644
|
| --- a/components/mus/public/cpp/lib/view_tree_host_factory.cc
|
| +++ b/components/mus/public/cpp/lib/view_tree_host_factory.cc
|
| @@ -8,27 +8,27 @@
|
| #include "components/mus/public/cpp/view_tree_delegate.h"
|
| #include "mojo/application/public/cpp/application_impl.h"
|
|
|
| -namespace mojo {
|
| +namespace mus {
|
|
|
| -void CreateViewTreeHost(ViewTreeHostFactory* factory,
|
| - ViewTreeHostClientPtr host_client,
|
| +void CreateViewTreeHost(mojo::ViewTreeHostFactory* factory,
|
| + mojo::ViewTreeHostClientPtr host_client,
|
| ViewTreeDelegate* delegate,
|
| - ViewTreeHostPtr* host) {
|
| - ViewTreeClientPtr tree_client;
|
| + mojo::ViewTreeHostPtr* host) {
|
| + mojo::ViewTreeClientPtr tree_client;
|
| ViewTreeConnection::Create(delegate, GetProxy(&tree_client));
|
| factory->CreateViewTreeHost(GetProxy(host), host_client.Pass(),
|
| tree_client.Pass());
|
| }
|
|
|
| -void CreateSingleViewTreeHost(ApplicationImpl* app,
|
| +void CreateSingleViewTreeHost(mojo::ApplicationImpl* app,
|
| ViewTreeDelegate* delegate,
|
| - ViewTreeHostPtr* host) {
|
| + mojo::ViewTreeHostPtr* host) {
|
| mojo::ViewTreeHostFactoryPtr factory;
|
| mojo::URLRequestPtr request(mojo::URLRequest::New());
|
| - request->url = "mojo:view_manager";
|
| + request->url = "mojo:mus";
|
| app->ConnectToService(request.Pass(), &factory);
|
| CreateViewTreeHost(factory.get(), mojo::ViewTreeHostClientPtr(), delegate,
|
| host);
|
| }
|
|
|
| -} // namespace mojo
|
| +} // namespace mus
|
|
|