ui/gfx/screen_mac.mm - 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/gfx/screen_mac.mm

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/gfx/screen_mac.mm

diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm

index 26e0278fa5a8518c9657ef7539d60eb6cbdb9875..b33af2da12999480b719b605020583ba306958bc 100644

--- a/ui/gfx/screen_mac.mm

+++ b/ui/gfx/screen_mac.mm

@@ -9,11 +9,11 @@

#include <stdint.h>

#include <map>

+#include <memory>

#include "base/logging.h"

#include "base/mac/sdk_forward_declarations.h"

#include "base/macros.h"

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

#include "base/timer/timer.h"

#include "ui/gfx/display.h"

#include "ui/gfx/display_change_notifier.h"

@@ -249,7 +249,7 @@ class ScreenMac : public gfx::Screen {

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

// HandleDisplayReconfiguration().

- scoped_ptr<base::OneShotTimer> configure_timer_;

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

gfx::DisplayChangeNotifier change_notifier_;

« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/sys_color_change_listener.cc » ('j') | no next file with comments »