Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1016)

Side by Side Diff: services/gfx/compositor/compositor_app.h

Issue 1928183002: Use TraceProviderRegistry in //services/dart/dart_tracing.*. (Closed) Base URL: https://github.com/domokit/mojo.git@work787_trace_provider_registry_2
Patch Set: gah Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_GFX_COMPOSITOR_COMPOSITOR_APP_H_ 5 #ifndef SERVICES_GFX_COMPOSITOR_COMPOSITOR_APP_H_
6 #define SERVICES_GFX_COMPOSITOR_COMPOSITOR_APP_H_ 6 #define SERVICES_GFX_COMPOSITOR_COMPOSITOR_APP_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "mojo/common/strong_binding_set.h" 12 #include "mojo/common/strong_binding_set.h"
13 #include "mojo/common/tracing_impl.h" 13 #include "mojo/common/tracing_impl.h"
14 #include "mojo/public/cpp/application/application_delegate.h" 14 #include "mojo/public/cpp/application/application_delegate.h"
15 #include "mojo/public/cpp/application/interface_factory.h"
jamesr 2016/04/28 23:00:28 these are unrelated fixes, right?
15 #include "mojo/services/gfx/composition/interfaces/compositor.mojom.h" 16 #include "mojo/services/gfx/composition/interfaces/compositor.mojom.h"
16 #include "services/gfx/compositor/compositor_engine.h" 17 #include "services/gfx/compositor/compositor_engine.h"
17 18
18 namespace compositor { 19 namespace compositor {
19 20
20 // Compositor application entry point. 21 // Compositor application entry point.
21 class CompositorApp 22 class CompositorApp
22 : public mojo::ApplicationDelegate, 23 : public mojo::ApplicationDelegate,
23 public mojo::InterfaceFactory<mojo::gfx::composition::Compositor> { 24 public mojo::InterfaceFactory<mojo::gfx::composition::Compositor> {
24 public: 25 public:
(...skipping 17 matching lines...) Expand all
42 mojo::StrongBindingSet<mojo::gfx::composition::Compositor> 43 mojo::StrongBindingSet<mojo::gfx::composition::Compositor>
43 compositor_bindings_; 44 compositor_bindings_;
44 std::unique_ptr<CompositorEngine> engine_; 45 std::unique_ptr<CompositorEngine> engine_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(CompositorApp); 47 DISALLOW_COPY_AND_ASSIGN(CompositorApp);
47 }; 48 };
48 49
49 } // namespace compositor 50 } // namespace compositor
50 51
51 #endif // SERVICES_GFX_COMPOSITOR_COMPOSITOR_APP_H_ 52 #endif // SERVICES_GFX_COMPOSITOR_COMPOSITOR_APP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698