OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ui/compositor/test/test_compositor_host.h" | 5 #include "ui/compositor/test/test_compositor_host.h" |
6 | 6 |
7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
8 | 8 |
| 9 #include <memory> |
| 10 |
9 #include "base/bind.h" | 11 #include "base/bind.h" |
10 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
11 #include "base/logging.h" | 13 #include "base/logging.h" |
12 #include "base/macros.h" | 14 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
15 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" |
16 #include "ui/compositor/compositor.h" | 17 #include "ui/compositor/compositor.h" |
17 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
18 #include "ui/gfx/x/x11_types.h" | 19 #include "ui/gfx/x/x11_types.h" |
19 | 20 |
20 namespace ui { | 21 namespace ui { |
21 | 22 |
22 class TestCompositorHostX11 : public TestCompositorHost { | 23 class TestCompositorHostX11 : public TestCompositorHost { |
23 public: | 24 public: |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 } | 83 } |
83 | 84 |
84 // static | 85 // static |
85 TestCompositorHost* TestCompositorHost::Create( | 86 TestCompositorHost* TestCompositorHost::Create( |
86 const gfx::Rect& bounds, | 87 const gfx::Rect& bounds, |
87 ui::ContextFactory* context_factory) { | 88 ui::ContextFactory* context_factory) { |
88 return new TestCompositorHostX11(bounds, context_factory); | 89 return new TestCompositorHostX11(bounds, context_factory); |
89 } | 90 } |
90 | 91 |
91 } // namespace ui | 92 } // namespace ui |
OLD | NEW |