ash/display/display_animator_chromeos.h - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

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: ash/display/display_animator_chromeos.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: 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:

Index: ash/display/display_animator_chromeos.h

diff --git a/ash/display/display_animator_chromeos.h b/ash/display/display_animator_chromeos.h

index a4fc768ff9ca32f659e54401c850e2756916e753..544ea02a384147e1dbae5299ff7a645662282e99 100644

--- a/ash/display/display_animator_chromeos.h

+++ b/ash/display/display_animator_chromeos.h

@@ -55,7 +55,7 @@ class ASH_EXPORT DisplayAnimatorChromeOS

void ClearHidingLayers();

std::map<aura::Window*, ui::Layer*> hiding_layers_;

- scoped_ptr<base::OneShotTimer> timer_;

+ std::unique_ptr<base::OneShotTimer> timer_;

base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_;

DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS);