| 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 "mojo/services/surfaces/surfaces_service_application.h" | 5 #include "mojo/services/surfaces/surfaces_service_application.h" |
| 6 | 6 |
| 7 #include "cc/surfaces/display.h" | 7 #include "cc/surfaces/display.h" |
| 8 | |
| 9 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
| 10 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/services/surfaces/surfaces_service_impl.h" | 10 #include "mojo/services/surfaces/surfaces_service_impl.h" |
| 12 | 11 |
| 13 namespace mojo { | 12 namespace mojo { |
| 14 | 13 |
| 15 SurfacesServiceApplication::SurfacesServiceApplication() | 14 SurfacesServiceApplication::SurfacesServiceApplication() |
| 16 : next_id_namespace_(1u), display_(NULL), draw_timer_(false, false) { | 15 : next_id_namespace_(1u), display_(NULL), draw_timer_(false, false) { |
| 17 } | 16 } |
| 18 | 17 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 49 if (display_ == display) | 48 if (display_ == display) |
| 50 SetDisplay(nullptr); | 49 SetDisplay(nullptr); |
| 51 } | 50 } |
| 52 | 51 |
| 53 } // namespace mojo | 52 } // namespace mojo |
| 54 | 53 |
| 55 MojoResult MojoMain(MojoHandle shell_handle) { | 54 MojoResult MojoMain(MojoHandle shell_handle) { |
| 56 mojo::ApplicationRunnerChromium runner(new mojo::SurfacesServiceApplication); | 55 mojo::ApplicationRunnerChromium runner(new mojo::SurfacesServiceApplication); |
| 57 return runner.Run(shell_handle); | 56 return runner.Run(shell_handle); |
| 58 } | 57 } |
| OLD | NEW |