ui/display/chromeos/x11/native_display_delegate_x11.h - Issue 508303002: Move touchscreen device caching to DeviceDataManager

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 508303002: Move touchscreen device caching to DeviceDataManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove PlatformEventObserver Created 6 years, 3 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

« ui/display/chromeos/touchscreen_delegate_impl_unittest.cc ('K') | « ui/display/chromeos/x11/display_configurator_x11.cc ('k') | ui/display/chromeos/x11/native_display_delegate_x11.cc » ('j') | ui/display/chromeos/x11/native_display_delegate_x11.cc » ('J')
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 12bed59505851dea3107d85a1d4fe4434c072afd..76a84f4512db0b17100cf4dcfafec685f3ca3e93 100644

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

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

@@ -41,6 +41,7 @@ namespace ui {

class DisplayModeX11;

class DisplaySnapshotX11;

+class InputDeviceEventObserver;

class NativeDisplayEventDispatcherX11;

class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {

@@ -96,7 +97,6 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {

private:

class HelperDelegateX11;

- class PlatformEventObserverX11;

// Parses all the modes made available by |screen_|.

void InitModes();

@@ -150,7 +150,7 @@ class DISPLAY_EXPORT NativeDisplayDelegateX11 : public NativeDisplayDelegate {

scoped_ptr<NativeDisplayEventDispatcherX11> platform_event_dispatcher_;

// Processes X11 display events that have no X11 window associated with it.

- scoped_ptr<PlatformEventObserverX11> platform_event_observer_;

+ scoped_ptr<InputDeviceEventObserver> input_hotplug_observer_;

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

ObserverList<NativeDisplayObserver> observers_;