| 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 "services/surfaces/surfaces_service_application.h" |
| 6 | 6 |
| 7 #include "cc/surfaces/display.h" | 7 #include "cc/surfaces/display.h" |
| 8 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
| 9 #include "mojo/common/tracing_impl.h" | 9 #include "mojo/common/tracing_impl.h" |
| 10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/services/surfaces/surfaces_service_impl.h" | 11 #include "services/surfaces/surfaces_service_impl.h" |
| 12 | 12 |
| 13 namespace mojo { | 13 namespace mojo { |
| 14 | 14 |
| 15 SurfacesServiceApplication::SurfacesServiceApplication() | 15 SurfacesServiceApplication::SurfacesServiceApplication() |
| 16 : tick_interval_(base::TimeDelta::FromMilliseconds(17)), | 16 : tick_interval_(base::TimeDelta::FromMilliseconds(17)), |
| 17 next_id_namespace_(1u), | 17 next_id_namespace_(1u), |
| 18 display_(NULL), | 18 display_(NULL), |
| 19 draw_timer_(false, false) { | 19 draw_timer_(false, false) { |
| 20 } | 20 } |
| 21 | 21 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 if (display_ == display) | 61 if (display_ == display) |
| 62 SetDisplay(nullptr); | 62 SetDisplay(nullptr); |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace mojo | 65 } // namespace mojo |
| 66 | 66 |
| 67 MojoResult MojoMain(MojoHandle shell_handle) { | 67 MojoResult MojoMain(MojoHandle shell_handle) { |
| 68 mojo::ApplicationRunnerChromium runner(new mojo::SurfacesServiceApplication); | 68 mojo::ApplicationRunnerChromium runner(new mojo::SurfacesServiceApplication); |
| 69 return runner.Run(shell_handle); | 69 return runner.Run(shell_handle); |
| 70 } | 70 } |
| OLD | NEW |