components/mus/ws/event_dispatcher.h - Issue 1906623003: Convert //components/mus from scoped_ptr to std::unique_ptr

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: components/mus/ws/event_dispatcher.h

Issue 1906623003: Convert //components/mus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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: components/mus/ws/event_dispatcher.h

diff --git a/components/mus/ws/event_dispatcher.h b/components/mus/ws/event_dispatcher.h

index 81bf4a09a122d4b6b890e73a342de88e3c5e6176..bc0e94832c224288af9565a74571462775fc9e03 100644

--- a/components/mus/ws/event_dispatcher.h

+++ b/components/mus/ws/event_dispatcher.h

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

#include <stdint.h>

#include <map>

+#include <memory>

#include "base/macros.h"

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

#include "cc/surfaces/surface_id.h"

#include "components/mus/public/interfaces/input_event_matcher.mojom.h"

#include "components/mus/ws/server_window_observer.h"

@@ -178,8 +178,8 @@ class EventDispatcher : public ServerWindowObserver {

cc::SurfaceId surface_id_;

- using Entry = std::pair<uint32_t, scoped_ptr<Accelerator>>;

- std::map<uint32_t, scoped_ptr<Accelerator>> accelerators_;

+ using Entry = std::pair<uint32_t, std::unique_ptr<Accelerator>>;

+ std::map<uint32_t, std::unique_ptr<Accelerator>> accelerators_;

using PointerIdToTargetMap = std::map<int32_t, PointerTarget>;

// |pointer_targets_| contains the active pointers. For a mouse based pointer

« no previous file with comments | « components/mus/ws/display_unittest.cc ('k') | components/mus/ws/event_dispatcher.cc » ('j') | no next file with comments »