ui/display/chromeos/x11/native_display_event_dispatcher_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/display/chromeos/x11/native_display_event_dispatcher_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/display/chromeos/x11/native_display_delegate_x11.h ('k') | ui/display/chromeos/x11/native_display_event_dispatcher_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/display/chromeos/x11/native_display_event_dispatcher_x11.h

diff --git a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h

index 1a1c650600547f1e14fd74a73e35a17d2efe8cc8..399063eeef6c211c50fac1ead00790d1c6651e22 100644

--- a/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h

+++ b/ui/display/chromeos/x11/native_display_event_dispatcher_x11.h

@@ -31,7 +31,7 @@ class DISPLAY_EXPORT NativeDisplayEventDispatcherX11

bool CanDispatchEvent(const PlatformEvent& event) override;

uint32_t DispatchEvent(const PlatformEvent& event) override;

- void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);

+ void SetTickClockForTest(std::unique_ptr<base::TickClock> tick_clock);

// How long the cached output is valid after startup.

static const int kUseCacheAfterStartupMs;

@@ -45,7 +45,7 @@ class DISPLAY_EXPORT NativeDisplayEventDispatcherX11

base::TimeTicks startup_time_;

- scoped_ptr<base::TickClock> tick_clock_;

+ std::unique_ptr<base::TickClock> tick_clock_;

DISALLOW_COPY_AND_ASSIGN(NativeDisplayEventDispatcherX11);

};