| Index: services/ui/view_manager/view_manager_app.h
|
| diff --git a/services/ui/view_manager/view_manager_app.h b/services/ui/view_manager/view_manager_app.h
|
| index 05e0844ffac9ab6f23deaf266110ec575add75a5..f28ae7ed4436f822dc1a4314aa78bd3318b7e366 100644
|
| --- a/services/ui/view_manager/view_manager_app.h
|
| +++ b/services/ui/view_manager/view_manager_app.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/macros.h"
|
| #include "mojo/common/strong_binding_set.h"
|
| #include "mojo/common/tracing_impl.h"
|
| -#include "mojo/public/cpp/application/application_delegate.h"
|
| +#include "mojo/public/cpp/application/application_impl_base.h"
|
| #include "mojo/services/gfx/composition/interfaces/compositor.mojom.h"
|
| #include "mojo/services/ui/views/interfaces/view_manager.mojom.h"
|
| #include "services/ui/view_manager/view_registry.h"
|
| @@ -18,22 +18,21 @@
|
| namespace view_manager {
|
|
|
| // View manager application entry point.
|
| -class ViewManagerApp : public mojo::ApplicationDelegate {
|
| +class ViewManagerApp : public mojo::ApplicationImplBase {
|
| public:
|
| ViewManagerApp();
|
| ~ViewManagerApp() override;
|
|
|
| private:
|
| - // |ApplicationDelegate|:
|
| - void Initialize(mojo::ApplicationImpl* app_impl) override;
|
| - bool ConfigureIncomingConnection(
|
| + // |ApplicationImplBase|:
|
| + void OnInitialize() override;
|
| + bool OnAcceptConnection(
|
| mojo::ServiceProviderImpl* service_provider_impl) override;
|
|
|
| void OnCompositorConnectionError();
|
|
|
| void Shutdown();
|
|
|
| - mojo::ApplicationImpl* app_impl_;
|
| mojo::TracingImpl tracing_;
|
|
|
| mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers_;
|
|
|