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

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

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

index e2952c0543db02ab931c5f0ce60c1f0867ed1cf7..b307450eb4e94188e7b96250952414c3052323a8 100644

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

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

@@ -8,13 +8,13 @@

#include <stdint.h>

#include <map>

+#include <memory>

#include <set>

#include <vector>

#include "base/compiler_specific.h"

#include "base/event_types.h"

#include "base/macros.h"

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

#include "base/memory/scoped_vector.h"

#include "base/observer_list.h"

#include "ui/display/display_export.h"

@@ -159,11 +159,11 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {

// propagate them.

ScopedVector<DisplaySnapshot> cached_outputs_;

- scoped_ptr<HelperDelegate> helper_delegate_;

+ std::unique_ptr<HelperDelegate> helper_delegate_;

// Processes X11 display events associated with the root window and notifies

// |observers_| when a display change has occurred.

- scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_;

+ std::unique_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_;

// List of observers waiting for display configuration change events.

base::ObserverList<NativeDisplayObserver> observers_;