| 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 <assert.h> |
| 6 #include <string> | 6 |
| 7 #include <memory> |
| 7 | 8 |
| 8 #include "base/bind.h" | 9 #include "base/bind.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "examples/spinning_cube/gles2_client_impl.h" | 11 #include "examples/spinning_cube/gles2_client_impl.h" |
| 11 #include "mojo/public/c/system/main.h" | 12 #include "mojo/public/c/system/main.h" |
| 12 #include "mojo/public/cpp/application/application_connection.h" | 13 #include "mojo/public/cpp/application/application_connection.h" |
| 13 #include "mojo/public/cpp/application/application_delegate.h" | 14 #include "mojo/public/cpp/application/application_delegate.h" |
| 14 #include "mojo/public/cpp/application/application_impl.h" | 15 #include "mojo/public/cpp/application/application_impl.h" |
| 15 #include "mojo/public/cpp/application/application_runner.h" | 16 #include "mojo/public/cpp/application/application_runner.h" |
| 16 #include "mojo/public/cpp/system/core.h" | 17 #include "mojo/public/cpp/system/core.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 mojo::NativeViewportPtr viewport_; | 85 mojo::NativeViewportPtr viewport_; |
| 85 mojo::ContextProviderPtr onscreen_context_provider_; | 86 mojo::ContextProviderPtr onscreen_context_provider_; |
| 86 mojo::Binding<NativeViewportEventDispatcher> dispatcher_binding_; | 87 mojo::Binding<NativeViewportEventDispatcher> dispatcher_binding_; |
| 87 | 88 |
| 88 DISALLOW_COPY_AND_ASSIGN(SpinningCubeApp); | 89 DISALLOW_COPY_AND_ASSIGN(SpinningCubeApp); |
| 89 }; | 90 }; |
| 90 | 91 |
| 91 } // namespace examples | 92 } // namespace examples |
| 92 | 93 |
| 93 MojoResult MojoMain(MojoHandle application_request) { | 94 MojoResult MojoMain(MojoHandle application_request) { |
| 94 mojo::ApplicationRunner runner(new examples::SpinningCubeApp); | 95 mojo::ApplicationRunner runner(std::unique_ptr<examples::SpinningCubeApp>( |
| 96 new examples::SpinningCubeApp())); |
| 95 return runner.Run(application_request); | 97 return runner.Run(application_request); |
| 96 } | 98 } |
| OLD | NEW |