| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "components/gles2/gpu_impl.h" | 8 #include "components/gles2/gpu_impl.h" |
| 9 #include "components/native_viewport/native_viewport_impl.h" | 9 #include "components/native_viewport/native_viewport_impl.h" |
| 10 #include "components/native_viewport/public/cpp/args.h" | 10 #include "components/native_viewport/public/cpp/args.h" |
| 11 #include "mojo/application/application_runner_chromium.h" | 11 #include "mojo/application/application_runner_chromium.h" |
| 12 #include "mojo/application/public/cpp/application_connection.h" |
| 13 #include "mojo/application/public/cpp/application_delegate.h" |
| 14 #include "mojo/application/public/cpp/application_impl.h" |
| 15 #include "mojo/application/public/cpp/interface_factory_impl.h" |
| 12 #include "mojo/common/tracing_impl.h" | 16 #include "mojo/common/tracing_impl.h" |
| 13 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 17 #include "third_party/mojo/src/mojo/public/c/system/main.h" |
| 14 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" | |
| 15 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.
h" | |
| 16 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | |
| 17 #include "third_party/mojo/src/mojo/public/cpp/application/interface_factory_imp
l.h" | |
| 18 #include "ui/events/event_switches.h" | 18 #include "ui/events/event_switches.h" |
| 19 #include "ui/gl/gl_surface.h" | 19 #include "ui/gl/gl_surface.h" |
| 20 | 20 |
| 21 using mojo::ApplicationConnection; | 21 using mojo::ApplicationConnection; |
| 22 using mojo::Gpu; | 22 using mojo::Gpu; |
| 23 using mojo::NativeViewport; | 23 using mojo::NativeViewport; |
| 24 | 24 |
| 25 namespace native_viewport { | 25 namespace native_viewport { |
| 26 | 26 |
| 27 class NativeViewportAppDelegate : public mojo::ApplicationDelegate, | 27 class NativeViewportAppDelegate : public mojo::ApplicationDelegate, |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate); | 75 DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate); |
| 76 }; | 76 }; |
| 77 } | 77 } |
| 78 | 78 |
| 79 MojoResult MojoMain(MojoHandle shell_handle) { | 79 MojoResult MojoMain(MojoHandle shell_handle) { |
| 80 mojo::ApplicationRunnerChromium runner( | 80 mojo::ApplicationRunnerChromium runner( |
| 81 new native_viewport::NativeViewportAppDelegate); | 81 new native_viewport::NativeViewportAppDelegate); |
| 82 runner.set_message_loop_type(base::MessageLoop::TYPE_UI); | 82 runner.set_message_loop_type(base::MessageLoop::TYPE_UI); |
| 83 return runner.Run(shell_handle); | 83 return runner.Run(shell_handle); |
| 84 } | 84 } |
| OLD | NEW |