| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/macros.h" | 5 #include "base/macros.h" |
| 6 #include "examples/ganesh_app/ganesh_view.h" | 6 #include "examples/ganesh_app/ganesh_view.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 9 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 new mojo::ViewManagerClientFactory(app->shell(), this)); | 27 new mojo::ViewManagerClientFactory(app->shell(), this)); |
| 28 } | 28 } |
| 29 | 29 |
| 30 bool ConfigureIncomingConnection( | 30 bool ConfigureIncomingConnection( |
| 31 mojo::ApplicationConnection* connection) override { | 31 mojo::ApplicationConnection* connection) override { |
| 32 connection->AddService(view_manager_client_factory_.get()); | 32 connection->AddService(view_manager_client_factory_.get()); |
| 33 return true; | 33 return true; |
| 34 } | 34 } |
| 35 | 35 |
| 36 void OnEmbed(mojo::View* root, | 36 void OnEmbed(mojo::View* root, |
| 37 mojo::ServiceProviderImpl* exported_services, | 37 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 38 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 38 mojo::ServiceProviderPtr exposed_services) override { |
| 39 new GaneshView(shell_, root); | 39 new GaneshView(shell_, root); |
| 40 } | 40 } |
| 41 | 41 |
| 42 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { | 42 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { |
| 43 base::MessageLoop::current()->Quit(); | 43 base::MessageLoop::current()->Quit(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 private: | 46 private: |
| 47 mojo::Shell* shell_; | 47 mojo::Shell* shell_; |
| 48 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; | 48 scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_; |
| 49 | 49 |
| 50 DISALLOW_COPY_AND_ASSIGN(GaneshApp); | 50 DISALLOW_COPY_AND_ASSIGN(GaneshApp); |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 } // namespace examples | 53 } // namespace examples |
| 54 | 54 |
| 55 MojoResult MojoMain(MojoHandle shell_handle) { | 55 MojoResult MojoMain(MojoHandle shell_handle) { |
| 56 mojo::ApplicationRunnerChromium runner(new examples::GaneshApp); | 56 mojo::ApplicationRunnerChromium runner(new examples::GaneshApp); |
| 57 return runner.Run(shell_handle); | 57 return runner.Run(shell_handle); |
| 58 } | 58 } |
| OLD | NEW |