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 <algorithm> | 5 #include <algorithm> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "components/gles2/gpu_impl.h" | 10 #include "components/gles2/gpu_impl.h" |
11 #include "components/native_viewport/native_viewport_impl.h" | 11 #include "components/native_viewport/native_viewport_impl.h" |
| 12 #include "components/native_viewport/public/cpp/args.h" |
12 #include "mojo/application/application_runner_chromium.h" | 13 #include "mojo/application/application_runner_chromium.h" |
13 #include "mojo/common/tracing_impl.h" | 14 #include "mojo/common/tracing_impl.h" |
14 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 15 #include "third_party/mojo/src/mojo/public/c/system/main.h" |
15 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" | 16 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" |
16 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.
h" | 17 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.
h" |
17 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | 18 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" |
18 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_imp
l.h" | 19 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_imp
l.h" |
19 #include "third_party/mojo_services/src/native_viewport/public/cpp/args.h" | |
20 #include "ui/events/event_switches.h" | 20 #include "ui/events/event_switches.h" |
21 #include "ui/gl/gl_surface.h" | 21 #include "ui/gl/gl_surface.h" |
22 | 22 |
23 using mojo::ApplicationConnection; | 23 using mojo::ApplicationConnection; |
24 using mojo::Gpu; | 24 using mojo::Gpu; |
25 using mojo::NativeViewport; | 25 using mojo::NativeViewport; |
26 | 26 |
27 namespace native_viewport { | 27 namespace native_viewport { |
28 | 28 |
29 class NativeViewportAppDelegate : public mojo::ApplicationDelegate, | 29 class NativeViewportAppDelegate : public mojo::ApplicationDelegate, |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate); | 90 DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate); |
91 }; | 91 }; |
92 } | 92 } |
93 | 93 |
94 MojoResult MojoMain(MojoHandle shell_handle) { | 94 MojoResult MojoMain(MojoHandle shell_handle) { |
95 mojo::ApplicationRunnerChromium runner( | 95 mojo::ApplicationRunnerChromium runner( |
96 new native_viewport::NativeViewportAppDelegate); | 96 new native_viewport::NativeViewportAppDelegate); |
97 runner.set_message_loop_type(base::MessageLoop::TYPE_UI); | 97 runner.set_message_loop_type(base::MessageLoop::TYPE_UI); |
98 return runner.Run(shell_handle); | 98 return runner.Run(shell_handle); |
99 } | 99 } |
OLD | NEW |