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 "mojo/application/application_runner_chromium.h" | 6 #include "mojo/application/application_runner_chromium.h" |
7 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
8 #include "mojo/public/cpp/application/application_connection.h" | 8 #include "mojo/public/cpp/application/application_connection.h" |
9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
10 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 SkyCompositorApp() : shell_(nullptr), view_(nullptr) {} | 37 SkyCompositorApp() : shell_(nullptr), view_(nullptr) {} |
38 virtual ~SkyCompositorApp() {} | 38 virtual ~SkyCompositorApp() {} |
39 | 39 |
40 void Initialize(mojo::ApplicationImpl* app) override { | 40 void Initialize(mojo::ApplicationImpl* app) override { |
41 shell_ = app->shell(); | 41 shell_ = app->shell(); |
42 view_manager_client_factory_.reset( | 42 view_manager_client_factory_.reset( |
43 new mojo::ViewManagerClientFactory(app->shell(), this)); | 43 new mojo::ViewManagerClientFactory(app->shell(), this)); |
44 } | 44 } |
45 | 45 |
46 bool ConfigureIncomingConnection( | 46 bool ConfigureIncomingConnection( |
47 mojo::ApplicationConnection* connection) override { | 47 mojo::ApplicationConnection* connection, |
| 48 const std::string& url) override { |
48 connection->AddService(view_manager_client_factory_.get()); | 49 connection->AddService(view_manager_client_factory_.get()); |
49 return true; | 50 return true; |
50 } | 51 } |
51 | 52 |
52 void OnEmbed(mojo::View* root, | 53 void OnEmbed(mojo::View* root, |
53 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 54 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
54 mojo::ServiceProviderPtr exposed_services) override { | 55 mojo::ServiceProviderPtr exposed_services) override { |
55 view_ = root; | 56 view_ = root; |
56 base_time_ = base::TimeTicks::Now(); | 57 base_time_ = base::TimeTicks::Now(); |
57 | 58 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 | 107 |
107 DISALLOW_COPY_AND_ASSIGN(SkyCompositorApp); | 108 DISALLOW_COPY_AND_ASSIGN(SkyCompositorApp); |
108 }; | 109 }; |
109 | 110 |
110 } // namespace examples | 111 } // namespace examples |
111 | 112 |
112 MojoResult MojoMain(MojoHandle handle) { | 113 MojoResult MojoMain(MojoHandle handle) { |
113 mojo::ApplicationRunnerChromium runner(new examples::SkyCompositorApp); | 114 mojo::ApplicationRunnerChromium runner(new examples::SkyCompositorApp); |
114 return runner.Run(handle); | 115 return runner.Run(handle); |
115 } | 116 } |
OLD | NEW |