ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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_window_tree_host_x11.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_window_tree_host_win.cc ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

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

index 7e842fed08646843dafbc444437beedc392d5980..1d3cbd7f8773b6c052e5c2115c3bec5ea79338c5 100644

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

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

@@ -80,7 +80,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11

void RemoveObserver(views::DesktopWindowTreeHostObserverX11* observer);

// Swaps the current handler for events in the non client view with |handler|.

- void SwapNonClientEventHandler(scoped_ptr<ui::EventHandler> handler);

+ void SwapNonClientEventHandler(std::unique_ptr<ui::EventHandler> handler);

// Runs the |func| callback for each content-window, and deallocates the

// internal list of open windows.

@@ -91,8 +91,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11

void Init(aura::Window* content_window,

const Widget::InitParams& params) override;

void OnNativeWidgetCreated(const Widget::InitParams& params) override;

- scoped_ptr<corewm::Tooltip> CreateTooltip() override;

- scoped_ptr<aura::client::DragDropClient> CreateDragDropClient(

+ std::unique_ptr<corewm::Tooltip> CreateTooltip() override;

+ std::unique_ptr<aura::client::DragDropClient> CreateDragDropClient(

DesktopNativeCursorManager* cursor_manager) override;

void Close() override;

void CloseNow() override;

@@ -300,8 +300,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11

DesktopDragDropClientAuraX11* drag_drop_client_;

- scoped_ptr<ui::EventHandler> x11_non_client_event_filter_;

- scoped_ptr<X11DesktopWindowMoveClient> x11_window_move_client_;

+ std::unique_ptr<ui::EventHandler> x11_non_client_event_filter_;

+ std::unique_ptr<X11DesktopWindowMoveClient> x11_window_move_client_;

// TODO(beng): Consider providing an interface to DesktopNativeWidgetAura

// instead of providing this route back to Widget.