ui/views/widget/desktop_aura/desktop_drop_target_win.cc - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/views/widget/desktop_aura/desktop_drop_target_win.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/views/widget/desktop_aura/desktop_drop_target_win.h ('k') | ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_drop_target_win.cc

diff --git a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc

index 6931bd5186338255f1c7d5476861b79c7a822f4f..875763dad35277f2f03ca262972ef98f8336a911 100644

--- a/ui/views/widget/desktop_aura/desktop_drop_target_win.cc

+++ b/ui/views/widget/desktop_aura/desktop_drop_target_win.cc

@@ -62,8 +62,8 @@ DWORD DesktopDropTargetWin::OnDragEnter(IDataObject* data_object,

DWORD key_state,

POINT position,

DWORD effect) {

- scoped_ptr<OSExchangeData> data;

- scoped_ptr<ui::DropTargetEvent> event;

+ std::unique_ptr<OSExchangeData> data;

+ std::unique_ptr<ui::DropTargetEvent> event;

DragDropDelegate* delegate;

// Translate will call OnDragEntered.

Translate(data_object, key_state, position, effect, &data, &event, &delegate);

@@ -76,8 +76,8 @@ DWORD DesktopDropTargetWin::OnDragOver(IDataObject* data_object,

POINT position,

DWORD effect) {

int drag_operation = ui::DragDropTypes::DRAG_NONE;

- scoped_ptr<OSExchangeData> data;

- scoped_ptr<ui::DropTargetEvent> event;

+ std::unique_ptr<OSExchangeData> data;

+ std::unique_ptr<ui::DropTargetEvent> event;

DragDropDelegate* delegate;

Translate(data_object, key_state, position, effect, &data, &event, &delegate);

if (delegate)

@@ -94,8 +94,8 @@ DWORD DesktopDropTargetWin::OnDrop(IDataObject* data_object,

POINT position,

DWORD effect) {

int drag_operation = ui::DragDropTypes::DRAG_NONE;

- scoped_ptr<OSExchangeData> data;

- scoped_ptr<ui::DropTargetEvent> event;

+ std::unique_ptr<OSExchangeData> data;

+ std::unique_ptr<ui::DropTargetEvent> event;

DragDropDelegate* delegate;

Translate(data_object, key_state, position, effect, &data, &event, &delegate);

if (delegate) {

@@ -123,8 +123,8 @@ void DesktopDropTargetWin::Translate(

DWORD key_state,

POINT position,

DWORD effect,

- scoped_ptr<OSExchangeData>* data,

- scoped_ptr<ui::DropTargetEvent>* event,

+ std::unique_ptr<OSExchangeData>* data,

+ std::unique_ptr<ui::DropTargetEvent>* event,

DragDropDelegate** delegate) {

gfx::Point location(position.x, position.y);

gfx::Point root_location = location;