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

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_drag_drop_client_aurax11_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_drop_target_win.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.h

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

index 24059b6f64c5bc162aabcb9998488cf503ea6fdf..b7fcf6c8a78570232e33c80933a3ce4560126418 100644

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

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

@@ -5,8 +5,9 @@

#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTIOP_DROP_TARGET_WIN_H_

#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTIOP_DROP_TARGET_WIN_H_

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "ui/aura/window_observer.h"

#include "ui/base/dragdrop/drop_target_win.h"

@@ -57,8 +58,8 @@ class DesktopDropTargetWin : public ui::DropTargetWin,

DWORD key_state,

POINT cursor_position,

DWORD effect,

- scoped_ptr<ui::OSExchangeData>* data,

- scoped_ptr<ui::DropTargetEvent>* event,

+ std::unique_ptr<ui::OSExchangeData>* data,

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

aura::client::DragDropDelegate** delegate);

void NotifyDragLeave();