| 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 #ifndef SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ | 5 #ifndef SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ |
| 6 #define SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ | 6 #define SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/timer/timer.h" | 9 #include "base/timer/timer.h" |
| 10 #include "cc/surfaces/surface_manager.h" | 10 #include "cc/surfaces/surface_manager.h" |
| 11 #include "mojo/common/tracing_impl.h" |
| 11 #include "mojo/public/cpp/application/application_delegate.h" | 12 #include "mojo/public/cpp/application/application_delegate.h" |
| 12 #include "mojo/public/cpp/application/interface_factory.h" | 13 #include "mojo/public/cpp/application/interface_factory.h" |
| 13 #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h" | 14 #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h" |
| 14 #include "services/surfaces/surfaces_impl.h" | 15 #include "services/surfaces/surfaces_impl.h" |
| 15 #include "services/surfaces/surfaces_scheduler.h" | 16 #include "services/surfaces/surfaces_scheduler.h" |
| 16 | 17 |
| 17 namespace mojo { | 18 namespace mojo { |
| 18 class ApplicationConnection; | 19 class ApplicationConnection; |
| 19 } | 20 } |
| 20 | 21 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 51 void OnDisplayBeingDestroyed(cc::Display* display) override; | 52 void OnDisplayBeingDestroyed(cc::Display* display) override; |
| 52 | 53 |
| 53 // SurfacesScheduler::Client | 54 // SurfacesScheduler::Client |
| 54 void Draw() override; | 55 void Draw() override; |
| 55 | 56 |
| 56 private: | 57 private: |
| 57 cc::SurfaceManager manager_; | 58 cc::SurfaceManager manager_; |
| 58 uint32_t next_id_namespace_; | 59 uint32_t next_id_namespace_; |
| 59 cc::Display* display_; | 60 cc::Display* display_; |
| 60 scoped_ptr<SurfacesScheduler> scheduler_; | 61 scoped_ptr<SurfacesScheduler> scheduler_; |
| 62 mojo::TracingImpl tracing_; |
| 61 | 63 |
| 62 DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication); | 64 DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication); |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 } // namespace surfaces | 67 } // namespace surfaces |
| 66 | 68 |
| 67 #endif // SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ | 69 #endif // SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ |
| OLD | NEW |