| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "cc/surfaces/surface_id_allocator.h" | 9 #include "cc/surfaces/surface_id_allocator.h" |
| 10 #include "examples/surfaces_app/child.mojom.h" | 10 #include "examples/surfaces_app/child.mojom.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 NativeViewportPtr viewport_; | 114 NativeViewportPtr viewport_; |
| 115 | 115 |
| 116 base::WeakPtrFactory<SurfacesApp> weak_factory_; | 116 base::WeakPtrFactory<SurfacesApp> weak_factory_; |
| 117 | 117 |
| 118 DISALLOW_COPY_AND_ASSIGN(SurfacesApp); | 118 DISALLOW_COPY_AND_ASSIGN(SurfacesApp); |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 } // namespace examples | 121 } // namespace examples |
| 122 } // namespace mojo | 122 } // namespace mojo |
| 123 | 123 |
| 124 MojoResult MojoMain(MojoHandle shell_handle) { | 124 MojoResult MojoMain(MojoHandle application_request) { |
| 125 mojo::ApplicationRunnerChromium runner(new mojo::examples::SurfacesApp); | 125 mojo::ApplicationRunnerChromium runner(new mojo::examples::SurfacesApp); |
| 126 return runner.Run(shell_handle); | 126 return runner.Run(application_request); |
| 127 } | 127 } |
| OLD | NEW |