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

Side by Side Diff: ash/mus/stub_context_factory.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/stub_context_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ASH_MUS_STUB_CONTEXT_FACTORY_H_ 5 #ifndef ASH_MUS_STUB_CONTEXT_FACTORY_H_
6 #define ASH_MUS_STUB_CONTEXT_FACTORY_H_ 6 #define ASH_MUS_STUB_CONTEXT_FACTORY_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/compositor/compositor.h" 11 #include "ui/compositor/compositor.h"
11 12
12 namespace cc { 13 namespace cc {
13 class SingleThreadTaskGraphRunner; 14 class SingleThreadTaskGraphRunner;
14 } 15 }
15 16
16 namespace ash { 17 namespace ash {
17 namespace sysui { 18 namespace sysui {
18 19
19 class StubContextFactory : public ui::ContextFactory { 20 class StubContextFactory : public ui::ContextFactory {
20 public: 21 public:
21 StubContextFactory(); 22 StubContextFactory();
22 ~StubContextFactory() override; 23 ~StubContextFactory() override;
23 24
24 private: 25 private:
25 // ui::ContextFactory implementation. 26 // ui::ContextFactory implementation.
26 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override; 27 void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;
27 scoped_ptr<ui::Reflector> CreateReflector( 28 std::unique_ptr<ui::Reflector> CreateReflector(
28 ui::Compositor* mirrored_compositor, 29 ui::Compositor* mirrored_compositor,
29 ui::Layer* mirroring_layer) override; 30 ui::Layer* mirroring_layer) override;
30 void RemoveReflector(ui::Reflector* reflector) override; 31 void RemoveReflector(ui::Reflector* reflector) override;
31 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override; 32 scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
32 void RemoveCompositor(ui::Compositor* compositor) override; 33 void RemoveCompositor(ui::Compositor* compositor) override;
33 bool DoesCreateTestContexts() override; 34 bool DoesCreateTestContexts() override;
34 uint32_t GetImageTextureTarget(gfx::BufferFormat format, 35 uint32_t GetImageTextureTarget(gfx::BufferFormat format,
35 gfx::BufferUsage usage) override; 36 gfx::BufferUsage usage) override;
36 cc::SharedBitmapManager* GetSharedBitmapManager() override; 37 cc::SharedBitmapManager* GetSharedBitmapManager() override;
37 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; 38 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
38 cc::TaskGraphRunner* GetTaskGraphRunner() override; 39 cc::TaskGraphRunner* GetTaskGraphRunner() override;
39 scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override; 40 std::unique_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
40 void ResizeDisplay(ui::Compositor* compositor, 41 void ResizeDisplay(ui::Compositor* compositor,
41 const gfx::Size& size) override; 42 const gfx::Size& size) override;
42 43
43 uint32_t next_surface_id_namespace_; 44 uint32_t next_surface_id_namespace_;
44 scoped_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_; 45 std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(StubContextFactory); 47 DISALLOW_COPY_AND_ASSIGN(StubContextFactory);
47 }; 48 };
48 49
49 } // namespace sysui 50 } // namespace sysui
50 } // namespace ash 51 } // namespace ash
51 52
52 #endif // ASH_MUS_STUB_CONTEXT_FACTORY_H_ 53 #endif // ASH_MUS_STUB_CONTEXT_FACTORY_H_
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.cc ('k') | ash/mus/stub_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698