Index: examples/ui/tile/tile_app.cc |
diff --git a/examples/ui/tile/tile_app.cc b/examples/ui/tile/tile_app.cc |
index 3360e1c0a88fdbbdf1d90527d12b5b3ea6a16ed5..2f5d4a41454473adce6134c6758a882a81a4e4da 100644 |
--- a/examples/ui/tile/tile_app.cc |
+++ b/examples/ui/tile/tile_app.cc |
@@ -11,55 +11,27 @@ |
namespace examples { |
-class TileViewProvider : public mojo::ui::ViewProvider { |
- public: |
- TileViewProvider(mojo::ApplicationImpl* app_impl, |
- const std::vector<std::string>& view_urls) |
- : app_impl_(app_impl), view_urls_(view_urls) {} |
- ~TileViewProvider() override {} |
- |
- private: |
- // |ViewProvider|: |
- void CreateView(mojo::InterfaceRequest<mojo::ServiceProvider> services, |
- mojo::ServiceProviderPtr exposed_services, |
- const CreateViewCallback& callback) override { |
- new TileView(app_impl_, view_urls_, callback); |
- } |
- |
- mojo::ApplicationImpl* app_impl_; |
- std::vector<std::string> view_urls_; |
- |
- DISALLOW_COPY_AND_ASSIGN(TileViewProvider); |
-}; |
- |
TileApp::TileApp() {} |
TileApp::~TileApp() {} |
-void TileApp::Initialize(mojo::ApplicationImpl* app_impl) { |
- app_impl_ = app_impl; |
-} |
- |
-bool TileApp::ConfigureIncomingConnection( |
- mojo::ApplicationConnection* connection) { |
- connection->AddService<mojo::ui::ViewProvider>(this); |
- return true; |
-} |
- |
-void TileApp::Create(mojo::ApplicationConnection* connection, |
- mojo::InterfaceRequest<mojo::ui::ViewProvider> request) { |
- GURL url(connection->GetConnectionURL()); |
+bool TileApp::CreateView( |
+ const std::string& connection_url, |
+ mojo::InterfaceRequest<mojo::ServiceProvider> services, |
+ mojo::ServiceProviderPtr exposed_services, |
+ const mojo::ui::ViewProvider::CreateViewCallback& callback) { |
+ GURL url(connection_url); |
std::vector<std::string> view_urls; |
base::SplitString(url.query(), ',', &view_urls); |
if (view_urls.empty()) { |
LOG(ERROR) << "Must supply comma-delimited URLs of mojo views to tile as a " |
"query parameter."; |
- return; |
+ return false; |
} |
- bindings_.AddBinding(new TileViewProvider(app_impl_, view_urls), |
- request.Pass()); |
+ new TileView(app_impl(), view_urls, callback); |
+ return true; |
} |
} // namespace examples |