ash/wm/dock/docked_window_layout_manager.cc - 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/wm/dock/docked_window_layout_manager.cc

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/wm/dock/docked_window_layout_manager.cc

diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc

index 517a4d243d7b8b15d570d1289bdf4920fa42f276..87144109f02156d9698577bb155dd16477caf21e 100644

--- a/ash/wm/dock/docked_window_layout_manager.cc

+++ b/ash/wm/dock/docked_window_layout_manager.cc

@@ -162,7 +162,8 @@ class DockedBackgroundWidget : public views::Widget,

float target_opacity =

(background_type == SHELF_BACKGROUND_MAXIMIZED) ? 1.0f : 0.0f;

- scoped_ptr<ui::ScopedLayerAnimationSettings> opaque_background_animation;

+ std::unique_ptr<ui::ScopedLayerAnimationSettings>

+ opaque_background_animation;

if (change_type != BACKGROUND_CHANGE_IMMEDIATE) {

opaque_background_animation.reset(new ui::ScopedLayerAnimationSettings(

opaque_background_.GetAnimator()));