ui/views/widget/desktop_aura/desktop_window_tree_host_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_window_tree_host_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_window_tree_host.h ('k') | ui/views/widget/desktop_aura/desktop_window_tree_host_win.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_win.h

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

index 3465112eac09eb175b0da762284e70fd02963e6a..4d62c39dd540db9256e6dcb7ce831d22f93f47d2 100644

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

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

@@ -48,8 +48,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin

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;

@@ -205,8 +205,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin

// Returns true if a modal window is active in the current root window chain.

bool IsModalWindowActive() const;

- scoped_ptr<HWNDMessageHandler> message_handler_;

- scoped_ptr<aura::client::FocusClient> focus_client_;

+ std::unique_ptr<HWNDMessageHandler> message_handler_;

+ std::unique_ptr<aura::client::FocusClient> focus_client_;

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

// instead of providing this route back to Widget.

@@ -258,7 +258,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin

// whenever the cursor visibility state changes.

static bool is_cursor_visible_;

- scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;

+ std::unique_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;

// Indicates if current window will receive mouse events when should not

// become activated.