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 | 8 |
| 9 #include "mojo/application/application_runner_chromium.h" |
9 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
10 #include "mojo/public/cpp/application/application_runner_chromium.h" | |
11 #include "mojo/services/surfaces/surfaces_service_impl.h" | 11 #include "mojo/services/surfaces/surfaces_service_impl.h" |
12 | 12 |
13 namespace mojo { | 13 namespace mojo { |
14 | 14 |
15 SurfacesServiceApplication::SurfacesServiceApplication() | 15 SurfacesServiceApplication::SurfacesServiceApplication() |
16 : next_id_namespace_(1u), display_(NULL), draw_timer_(false, false) { | 16 : next_id_namespace_(1u), display_(NULL), draw_timer_(false, false) { |
17 } | 17 } |
18 | 18 |
19 SurfacesServiceApplication::~SurfacesServiceApplication() { | 19 SurfacesServiceApplication::~SurfacesServiceApplication() { |
20 } | 20 } |
(...skipping 23 matching lines...) Expand all Loading... |
44 void SurfacesServiceApplication::SetDisplay(cc::Display* display) { | 44 void SurfacesServiceApplication::SetDisplay(cc::Display* display) { |
45 display_ = display; | 45 display_ = display; |
46 } | 46 } |
47 | 47 |
48 } // namespace mojo | 48 } // namespace mojo |
49 | 49 |
50 MojoResult MojoMain(MojoHandle shell_handle) { | 50 MojoResult MojoMain(MojoHandle shell_handle) { |
51 mojo::ApplicationRunnerChromium runner(new mojo::SurfacesServiceApplication); | 51 mojo::ApplicationRunnerChromium runner(new mojo::SurfacesServiceApplication); |
52 return runner.Run(shell_handle); | 52 return runner.Run(shell_handle); |
53 } | 53 } |
OLD | NEW |