| Index: examples/ui/tile/tile_app.h
|
| diff --git a/examples/ui/tile/tile_app.h b/examples/ui/tile/tile_app.h
|
| index 35227dbbe94774209ae9934a05405b9775f02fe1..1b4d61996c11b62e58d2b11b9b47cb48522a44bf 100644
|
| --- a/examples/ui/tile/tile_app.h
|
| +++ b/examples/ui/tile/tile_app.h
|
| @@ -5,37 +5,22 @@
|
| #ifndef EXAMPLES_UI_TILE_TILE_APP_H_
|
| #define EXAMPLES_UI_TILE_TILE_APP_H_
|
|
|
| -#include "base/bind.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "mojo/common/strong_binding_set.h"
|
| -#include "mojo/public/c/system/main.h"
|
| -#include "mojo/public/cpp/application/application_connection.h"
|
| -#include "mojo/public/cpp/application/application_impl.h"
|
| -#include "mojo/public/cpp/system/core.h"
|
| -#include "mojo/public/cpp/system/macros.h"
|
| -#include "mojo/services/ui/views/interfaces/view_provider.mojom.h"
|
| +#include "mojo/ui/view_provider_app.h"
|
|
|
| namespace examples {
|
|
|
| -class TileApp : public mojo::ApplicationDelegate,
|
| - public mojo::InterfaceFactory<mojo::ui::ViewProvider> {
|
| +class TileApp : public mojo::ui::ViewProviderApp {
|
| public:
|
| TileApp();
|
| ~TileApp() override;
|
|
|
| - // |ApplicationDelegate|:
|
| - void Initialize(mojo::ApplicationImpl* app) override;
|
| - bool ConfigureIncomingConnection(
|
| - mojo::ApplicationConnection* connection) override;
|
| -
|
| - // |InterfaceFactory<mojo::ui::ViewProvider>|:
|
| - void Create(mojo::ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<mojo::ui::ViewProvider> request) override;
|
| + bool CreateView(
|
| + const std::string& connection_url,
|
| + mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| + mojo::ServiceProviderPtr exposed_services,
|
| + const mojo::ui::ViewProvider::CreateViewCallback& callback) override;
|
|
|
| private:
|
| - mojo::ApplicationImpl* app_impl_;
|
| - mojo::StrongBindingSet<mojo::ui::ViewProvider> bindings_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(TileApp);
|
| };
|
|
|
|
|