Chromium Code Reviews| Index: chrome/browser/mojo_runner_state.cc |
| diff --git a/chrome/browser/mojo_runner_state.cc b/chrome/browser/mojo_runner_state.cc |
| index 593d043424f91a808cb6d6347ace14010db30cf7..4d9461fa3039071f2481d0d0c81d89f23ca3bc49 100644 |
| --- a/chrome/browser/mojo_runner_state.cc |
| +++ b/chrome/browser/mojo_runner_state.cc |
| @@ -4,9 +4,12 @@ |
| #include "chrome/browser/mojo_runner_state.h" |
| +#include "components/mus/public/interfaces/window_manager.mojom.h" |
| #include "mojo/application/public/cpp/application_delegate.h" |
| #include "mojo/application/public/cpp/application_impl.h" |
| +#include "mojo/converters/network/network_type_converters.h" |
| #include "mojo/runner/child/runner_connection.h" |
| +#include "ui/views/mus/window_manager_connection.h" |
| class ChromeApplicationDelegate : public mojo::ApplicationDelegate { |
| public: |
| @@ -15,7 +18,11 @@ class ChromeApplicationDelegate : public mojo::ApplicationDelegate { |
| private: |
| void Initialize(mojo::ApplicationImpl* application) override { |
| - // TODO(beng): Connect to the window manager. |
| + mus::mojom::WindowManagerPtr window_manager; |
|
sky
2015/11/06 17:07:46
This looks weird since you drop the WindowManagerP
Ben Goodger (Google)
2015/11/09 20:23:14
I don't drop it on the floor, I .Pass() it to Wind
|
| + application->ConnectToService( |
| + mojo::URLRequest::From(std::string("mojo:example_wm")), |
| + &window_manager); |
| + views::WindowManagerConnection::Create(window_manager.Pass(), application); |
| } |
| bool ConfigureIncomingConnection( |
| mojo::ApplicationConnection* connection) override { |