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 <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "mojo/application/application_runner_chromium.h" |
11 #include "mojo/examples/media_viewer/media_viewer.mojom.h" | 12 #include "mojo/examples/media_viewer/media_viewer.mojom.h" |
12 #include "mojo/public/c/system/main.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" |
15 #include "mojo/public/cpp/application/application_impl.h" | 16 #include "mojo/public/cpp/application/application_impl.h" |
16 #include "mojo/public/cpp/application/application_runner_chromium.h" | |
17 #include "mojo/public/cpp/application/interface_factory_impl.h" | 17 #include "mojo/public/cpp/application/interface_factory_impl.h" |
18 #include "mojo/public/cpp/bindings/interface_impl.h" | 18 #include "mojo/public/cpp/bindings/interface_impl.h" |
19 #include "mojo/services/public/cpp/view_manager/view.h" | 19 #include "mojo/services/public/cpp/view_manager/view.h" |
20 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 20 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
21 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 21 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
22 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 22 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
23 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 23 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
24 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" | 24 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" |
25 #include "mojo/views/native_widget_view_manager.h" | 25 #include "mojo/views/native_widget_view_manager.h" |
26 #include "mojo/views/views_init.h" | 26 #include "mojo/views/views_init.h" |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 DISALLOW_COPY_AND_ASSIGN(MediaViewer); | 312 DISALLOW_COPY_AND_ASSIGN(MediaViewer); |
313 }; | 313 }; |
314 | 314 |
315 } // namespace examples | 315 } // namespace examples |
316 } // namespace mojo | 316 } // namespace mojo |
317 | 317 |
318 MojoResult MojoMain(MojoHandle shell_handle) { | 318 MojoResult MojoMain(MojoHandle shell_handle) { |
319 mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer); | 319 mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer); |
320 return runner.Run(shell_handle); | 320 return runner.Run(shell_handle); |
321 } | 321 } |
OLD | NEW |