| Index: ash/mus/window_manager_application.cc
|
| diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
|
| index 3959d38b0bd54ed49f6867194331d56e747a671a..aeef95ed4512e610ed0b56c110f3f89a4004870c 100644
|
| --- a/ash/mus/window_manager_application.cc
|
| +++ b/ash/mus/window_manager_application.cc
|
| @@ -53,9 +53,9 @@ void WindowManagerApplication::InitWindowManager(
|
| window_manager_->AddObserver(this);
|
| }
|
|
|
| -void WindowManagerApplication::Initialize(shell::Connector* connector,
|
| - const shell::Identity& identity,
|
| - uint32_t id) {
|
| +void WindowManagerApplication::OnStart(shell::Connector* connector,
|
| + const shell::Identity& identity,
|
| + uint32_t id) {
|
| connector_ = connector;
|
| ::ui::GpuService::Initialize(connector);
|
| window_manager_.reset(new WindowManager(connector_));
|
| @@ -71,7 +71,7 @@ void WindowManagerApplication::Initialize(shell::Connector* connector,
|
| InitWindowManager(window_tree_client);
|
| }
|
|
|
| -bool WindowManagerApplication::AcceptConnection(shell::Connection* connection) {
|
| +bool WindowManagerApplication::OnConnect(shell::Connection* connection) {
|
| connection->AddInterface<mojom::ShelfLayout>(this);
|
| connection->AddInterface<mojom::UserWindowController>(this);
|
| connection->AddInterface<::ui::mojom::AcceleratorRegistrar>(this);
|
|
|