ash/shell/window_watcher.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/shell/window_watcher.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/shell/window_watcher.cc

diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc

index e8163b257f59004f0e65a014af01f5b75f499662..991a83b7031e02f5e404b828c9c521b4e2731f44 100644

--- a/ash/shell/window_watcher.cc

+++ b/ash/shell/window_watcher.cc

@@ -118,7 +118,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) {

ShelfItemDelegateManager* manager =

Shell::GetInstance()->shelf_item_delegate_manager();

- scoped_ptr<ShelfItemDelegate> delegate(

+ std::unique_ptr<ShelfItemDelegate> delegate(

new WindowWatcherShelfItemDelegate(id, this));

manager->SetShelfItemDelegate(id, std::move(delegate));

SetShelfIDForWindow(id, new_window);

« no previous file with comments | « ash/shell/window_watcher.h ('k') | ash/shell_init_params.h » ('j') | no next file with comments »