| 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 "mojo/application/application_runner_chromium.h" | 10 #include "mojo/application/application_runner_chromium.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 84 } |
| 85 | 85 |
| 86 scoped_refptr<gles2::GpuState> gpu_state_; | 86 scoped_refptr<gles2::GpuState> gpu_state_; |
| 87 bool is_headless_; | 87 bool is_headless_; |
| 88 mojo::TracingImpl tracing_; | 88 mojo::TracingImpl tracing_; |
| 89 | 89 |
| 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 application_request) { |
| 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(application_request); |
| 99 } | 99 } |
| OLD | NEW |