ui/wm/public/scoped_drag_drop_disabler.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/wm/public/scoped_drag_drop_disabler.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

Index: ui/wm/public/scoped_drag_drop_disabler.h

diff --git a/ui/wm/public/scoped_drag_drop_disabler.h b/ui/wm/public/scoped_drag_drop_disabler.h

index 4f708eede559f988107ab1b7b9f33ee254439fa9..bbbd93c7ae5030f2279872e780a73ea15db651bc 100644

--- a/ui/wm/public/scoped_drag_drop_disabler.h

+++ b/ui/wm/public/scoped_drag_drop_disabler.h

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

#ifndef UI_WM_PUBLIC_SCOPED_DRAG_DROP_DISABLER_H_

#define UI_WM_PUBLIC_SCOPED_DRAG_DROP_DISABLER_H_

+#include <memory>

#include "base/macros.h"

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

#include "ui/aura/window_observer.h"

namespace aura {

@@ -29,7 +30,7 @@ class AURA_EXPORT ScopedDragDropDisabler : public WindowObserver {

Window* window_;

DragDropClient* old_client_;

- scoped_ptr<DragDropClient> new_client_;

+ std::unique_ptr<DragDropClient> new_client_;

DISALLOW_COPY_AND_ASSIGN(ScopedDragDropDisabler);

};

« no previous file with comments | « ui/wm/core/wm_state.h ('k') | ui/wm/test/wm_test_helper.h » ('j') | no next file with comments »