extensions/shell/browser/shell_desktop_controller_aura.cc - Issue 1908953003: Convert //extensions/{common,shell} 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: extensions/shell/browser/shell_desktop_controller_aura.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase? 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

« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_aura.h ('k') | extensions/shell/browser/shell_desktop_controller_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/shell/browser/shell_desktop_controller_aura.cc

diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc

index 0abc51ac1368d1cd140451ac7e54aa4fdf3d6338..750110f43311de78d873c78720322fc855c73431 100644

--- a/extensions/shell/browser/shell_desktop_controller_aura.cc

+++ b/extensions/shell/browser/shell_desktop_controller_aura.cc

@@ -150,7 +150,7 @@ class ShellNativeCursorManager : public wm::NativeCursorManager {

aura::WindowTreeHost* host_; // Not owned.

- scoped_ptr<ui::ImageCursors> image_cursors_;

+ std::unique_ptr<ui::ImageCursors> image_cursors_;

DISALLOW_COPY_AND_ASSIGN(ShellNativeCursorManager);

};

@@ -283,7 +283,7 @@ void ShellDesktopControllerAura::InitWindowManager() {

host_->window()->SetLayoutManager(new FillLayout);

cursor_manager_.reset(

- new wm::CursorManager(scoped_ptr<wm::NativeCursorManager>(

+ new wm::CursorManager(std::unique_ptr<wm::NativeCursorManager>(

new ShellNativeCursorManager(host_.get()))));

cursor_manager_->SetDisplay(gfx::Screen::GetScreen()->GetPrimaryDisplay());

cursor_manager_->SetCursor(ui::kCursorPointer);