| 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 : public ApplicationDelegate, | 42 : public ApplicationDelegate, |
| 43 public ViewManagerDelegate, | 43 public ViewManagerDelegate, |
| 44 public ViewObserver { | 44 public ViewObserver { |
| 45 public: | 45 public: |
| 46 EmbeddedApp() { url::AddStandardScheme("mojo"); } | 46 EmbeddedApp() { url::AddStandardScheme("mojo"); } |
| 47 virtual ~EmbeddedApp() {} | 47 virtual ~EmbeddedApp() {} |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 | 50 |
| 51 // Overridden from ApplicationDelegate: | 51 // Overridden from ApplicationDelegate: |
| 52 virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE { | 52 virtual void Initialize(ApplicationImpl* app) override { |
| 53 view_manager_client_factory_.reset( | 53 view_manager_client_factory_.reset( |
| 54 new ViewManagerClientFactory(app->shell(), this)); | 54 new ViewManagerClientFactory(app->shell(), this)); |
| 55 } | 55 } |
| 56 | 56 |
| 57 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) | 57 virtual bool ConfigureIncomingConnection( |
| 58 MOJO_OVERRIDE { | 58 ApplicationConnection* connection) override { |
| 59 connection->AddService(view_manager_client_factory_.get()); | 59 connection->AddService(view_manager_client_factory_.get()); |
| 60 return true; | 60 return true; |
| 61 } | 61 } |
| 62 | 62 |
| 63 // Overridden from ViewManagerDelegate: | 63 // Overridden from ViewManagerDelegate: |
| 64 virtual void OnEmbed(ViewManager* view_manager, | 64 virtual void OnEmbed(ViewManager* view_manager, |
| 65 View* root, | 65 View* root, |
| 66 ServiceProviderImpl* exported_services, | 66 ServiceProviderImpl* exported_services, |
| 67 scoped_ptr<ServiceProvider> imported_services) OVERRIDE { | 67 scoped_ptr<ServiceProvider> imported_services) OVERRIDE { |
| 68 root->AddObserver(this); | 68 root->AddObserver(this); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 DISALLOW_COPY_AND_ASSIGN(EmbeddedApp); | 101 DISALLOW_COPY_AND_ASSIGN(EmbeddedApp); |
| 102 }; | 102 }; |
| 103 | 103 |
| 104 } // namespace examples | 104 } // namespace examples |
| 105 } // namespace mojo | 105 } // namespace mojo |
| 106 | 106 |
| 107 MojoResult MojoMain(MojoHandle shell_handle) { | 107 MojoResult MojoMain(MojoHandle shell_handle) { |
| 108 mojo::ApplicationRunnerChromium runner(new mojo::examples::EmbeddedApp); | 108 mojo::ApplicationRunnerChromium runner(new mojo::examples::EmbeddedApp); |
| 109 return runner.Run(shell_handle); | 109 return runner.Run(shell_handle); |
| 110 } | 110 } |
| OLD | NEW |