OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdio.h> | 5 #include <stdio.h> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "mojo/aura/context_factory_mojo.h" | 9 #include "mojo/aura/context_factory_mojo.h" |
10 #include "mojo/aura/screen_mojo.h" | 10 #include "mojo/aura/screen_mojo.h" |
11 #include "mojo/aura/window_tree_host_mojo.h" | 11 #include "mojo/aura/window_tree_host_mojo.h" |
12 #include "mojo/aura/window_tree_host_mojo_delegate.h" | 12 #include "mojo/aura/window_tree_host_mojo_delegate.h" |
| 13 #include "mojo/public/c/system/main.h" |
13 #include "mojo/public/cpp/application/application_connection.h" | 14 #include "mojo/public/cpp/application/application_connection.h" |
14 #include "mojo/public/cpp/application/application_delegate.h" | 15 #include "mojo/public/cpp/application/application_delegate.h" |
| 16 #include "mojo/public/cpp/application/application_runner_chromium.h" |
15 #include "mojo/public/cpp/system/core.h" | 17 #include "mojo/public/cpp/system/core.h" |
16 #include "mojo/services/public/cpp/view_manager/view.h" | 18 #include "mojo/services/public/cpp/view_manager/view.h" |
17 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 19 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
18 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 20 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
19 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 21 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
20 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" | 22 #include "mojo/services/public/interfaces/native_viewport/native_viewport.mojom.
h" |
21 #include "ui/aura/client/default_capture_client.h" | 23 #include "ui/aura/client/default_capture_client.h" |
22 #include "ui/aura/client/window_tree_client.h" | 24 #include "ui/aura/client/window_tree_client.h" |
23 #include "ui/aura/env.h" | 25 #include "ui/aura/env.h" |
24 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 View* root_; | 195 View* root_; |
194 | 196 |
195 ViewManagerClientFactory view_manager_client_factory_; | 197 ViewManagerClientFactory view_manager_client_factory_; |
196 | 198 |
197 scoped_ptr<aura::WindowTreeHost> window_tree_host_; | 199 scoped_ptr<aura::WindowTreeHost> window_tree_host_; |
198 | 200 |
199 DISALLOW_COPY_AND_ASSIGN(AuraDemo); | 201 DISALLOW_COPY_AND_ASSIGN(AuraDemo); |
200 }; | 202 }; |
201 | 203 |
202 } // namespace examples | 204 } // namespace examples |
| 205 } // namespace mojo |
203 | 206 |
204 // static | 207 MojoResult MojoMain(MojoHandle shell_handle) { |
205 ApplicationDelegate* ApplicationDelegate::Create() { | 208 mojo::ApplicationRunnerChromium runner(new mojo::examples::AuraDemo); |
206 return new examples::AuraDemo(); | 209 return runner.Run(shell_handle); |
207 } | 210 } |
208 | |
209 } // namespace mojo | |
OLD | NEW |