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

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

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

index e96d983ccb2d293a68442dfd9ef13ed2718716ff..31f5f02a3ae280ce41100d994820b8d1a5069e5e 100644

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

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

@@ -7,8 +7,9 @@

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

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

#include "base/timer/timer.h"

#include "ui/events/platform/platform_event_dispatcher.h"

#include "ui/gfx/display_change_notifier.h"

@@ -89,7 +90,7 @@ class VIEWS_EXPORT DesktopScreenX11 : public gfx::Screen,

// The timer to delay configuring outputs. See also the comments in

// Dispatch().

- scoped_ptr<base::OneShotTimer> configure_timer_;

+ std::unique_ptr<base::OneShotTimer> configure_timer_;

gfx::DisplayChangeNotifier change_notifier_;