| Index: examples/ui/tile/tile_app.h
|
| diff --git a/examples/ui/spinning_cube/spinning_cube_app.h b/examples/ui/tile/tile_app.h
|
| similarity index 56%
|
| copy from examples/ui/spinning_cube/spinning_cube_app.h
|
| copy to examples/ui/tile/tile_app.h
|
| index d1e99e7c58a31655bda705a2b361c4549ff26f6c..35227dbbe94774209ae9934a05405b9775f02fe1 100644
|
| --- a/examples/ui/spinning_cube/spinning_cube_app.h
|
| +++ b/examples/ui/tile/tile_app.h
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef EXAMPLES_UI_SPINNING_CUBE_SPINNING_CUBE_APP_H_
|
| -#define EXAMPLES_UI_SPINNING_CUBE_SPINNING_CUBE_APP_H_
|
| +#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/binding_set.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"
|
| @@ -17,14 +17,12 @@
|
|
|
| namespace examples {
|
|
|
| -class SpinningCubeApp : public mojo::ApplicationDelegate,
|
| - public mojo::InterfaceFactory<mojo::ui::ViewProvider>,
|
| - public mojo::ui::ViewProvider {
|
| +class TileApp : public mojo::ApplicationDelegate,
|
| + public mojo::InterfaceFactory<mojo::ui::ViewProvider> {
|
| public:
|
| - SpinningCubeApp();
|
| - ~SpinningCubeApp() override;
|
| + TileApp();
|
| + ~TileApp() override;
|
|
|
| - private:
|
| // |ApplicationDelegate|:
|
| void Initialize(mojo::ApplicationImpl* app) override;
|
| bool ConfigureIncomingConnection(
|
| @@ -34,17 +32,13 @@ class SpinningCubeApp : public mojo::ApplicationDelegate,
|
| void Create(mojo::ApplicationConnection* connection,
|
| mojo::InterfaceRequest<mojo::ui::ViewProvider> request) override;
|
|
|
| - // |ViewProvider|:
|
| - void CreateView(mojo::InterfaceRequest<mojo::ServiceProvider> services,
|
| - mojo::ServiceProviderPtr exposed_services,
|
| - const CreateViewCallback& callback) override;
|
| -
|
| + private:
|
| mojo::ApplicationImpl* app_impl_;
|
| - mojo::BindingSet<mojo::ui::ViewProvider> bindings_;
|
| + mojo::StrongBindingSet<mojo::ui::ViewProvider> bindings_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(SpinningCubeApp);
|
| + DISALLOW_COPY_AND_ASSIGN(TileApp);
|
| };
|
|
|
| } // namespace examples
|
|
|
| -#endif // EXAMPLES_UI_SPINNING_CUBE_SPINNING_CUBE_APP_H_
|
| +#endif // EXAMPLES_UI_TILE_TILE_APP_H_
|
|
|