Index: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc |
index fa9ea48b50071c9c5110abc17c1fd37933594683..17525593bee8ea61c1cf915dc8853da1a86a917a 100644 |
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc |
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc |
@@ -4,6 +4,7 @@ |
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" |
+#include "base/memory/ptr_util.h" |
#include "third_party/skia/include/core/SkPath.h" |
#include "third_party/skia/include/core/SkRegion.h" |
#include "ui/aura/client/aura_constants.h" |
@@ -170,17 +171,17 @@ void DesktopWindowTreeHostWin::OnNativeWidgetCreated( |
SetWindowTransparency(); |
} |
-scoped_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() { |
+std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() { |
DCHECK(!tooltip_); |
tooltip_ = new corewm::TooltipWin(GetAcceleratedWidget()); |
- return make_scoped_ptr(tooltip_); |
+ return base::WrapUnique(tooltip_); |
} |
-scoped_ptr<aura::client::DragDropClient> |
+std::unique_ptr<aura::client::DragDropClient> |
DesktopWindowTreeHostWin::CreateDragDropClient( |
DesktopNativeCursorManager* cursor_manager) { |
drag_drop_client_ = new DesktopDragDropClientWin(window(), GetHWND()); |
- return make_scoped_ptr(drag_drop_client_); |
+ return base::WrapUnique(drag_drop_client_); |
} |
void DesktopWindowTreeHostWin::Close() { |