ui/views/mus/surface_context_factory.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/mus/surface_context_factory.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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 side-by-side diff with in-line comments

Download patch

Index: ui/views/mus/surface_context_factory.h

diff --git a/ui/views/mus/surface_context_factory.h b/ui/views/mus/surface_context_factory.h

index 6399d5a011ba342eba580fdc28fb23fe9c5984fa..087fc032c44967441e2e7f6978ce46ed2a901871 100644

--- a/ui/views/mus/surface_context_factory.h

+++ b/ui/views/mus/surface_context_factory.h

@@ -35,7 +35,7 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {

private:

// ContextFactory:

void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;

- scoped_ptr<ui::Reflector> CreateReflector(

+ std::unique_ptr<ui::Reflector> CreateReflector(

ui::Compositor* mirrored_compositor,

ui::Layer* mirroring_layer) override;

void RemoveReflector(ui::Reflector* reflector) override;

@@ -47,7 +47,7 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {

cc::SharedBitmapManager* GetSharedBitmapManager() override;

gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;

cc::TaskGraphRunner* GetTaskGraphRunner() override;

- scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;

+ std::unique_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;

void ResizeDisplay(ui::Compositor* compositor,

const gfx::Size& size) override;

« no previous file with comments | « ui/views/mus/surface_binding.cc ('k') | ui/views/mus/surface_context_factory.cc » ('j') | no next file with comments »