ui/events/devices/x11/touch_factory_x11.h - Issue 2050943002: Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

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/events/devices/x11/touch_factory_x11.h

Issue 2050943002: Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 4 years, 6 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:

Index: ui/events/devices/x11/touch_factory_x11.h

diff --git a/ui/events/devices/x11/touch_factory_x11.h b/ui/events/devices/x11/touch_factory_x11.h

index c2e95802deea66f3cf39312efff3e0a744e3c3f8..32876d55eeeccdd3fbe12294baf30af21bf74888 100644

--- a/ui/events/devices/x11/touch_factory_x11.h

+++ b/ui/events/devices/x11/touch_factory_x11.h

@@ -14,7 +14,9 @@

#include "ui/events/devices/events_devices_export.h"

#include "ui/gfx/sequential_id_generator.h"

+namespace base {

template <typename T> struct DefaultSingletonTraits;

+} // namespace base

typedef unsigned long Cursor;

typedef unsigned long Window;

@@ -95,8 +97,8 @@ class EVENTS_DEVICES_EXPORT TouchFactory {

void SetPointerDeviceForTest(const std::vector<int>& devices);

private:

- // Requirement for Singleton

- friend struct DefaultSingletonTraits<TouchFactory>;

+ // Requirement for base::Singleton

+ friend struct base::DefaultSingletonTraits<TouchFactory>;

void CacheTouchscreenIds(int id);