ash/wm/lock_window_state.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/lock_window_state.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: 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:

Index: ash/wm/lock_window_state.cc

diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc

index 7e5b4ec37331f5eb57087b25d8d1e95595bc6f87..d5f89a3d707be24b6396f2e585764c52808bbac3 100644

--- a/ash/wm/lock_window_state.cc

+++ b/ash/wm/lock_window_state.cc

@@ -112,8 +112,9 @@ void LockWindowState::DetachState(wm::WindowState* window_state) {

// static

wm::WindowState* LockWindowState::SetLockWindowState(aura::Window* window) {

- scoped_ptr<wm::WindowState::State> lock_state(new LockWindowState(window));

- scoped_ptr<wm::WindowState::State> old_state(

+ std::unique_ptr<wm::WindowState::State> lock_state(

+ new LockWindowState(window));

+ std::unique_ptr<wm::WindowState::State> old_state(

wm::GetWindowState(window)->SetStateObject(std::move(lock_state)));

return wm::GetWindowState(window);

}