ui/ozone/platform/egltest/ozone_platform_egltest.cc - 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/ozone/platform/egltest/ozone_platform_egltest.cc

Issue 508303002: Move touchscreen device caching to DeviceDataManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . 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/x11/native_display_delegate_x11.cc ('K') | « ui/ozone/platform/dri/ozone_platform_gbm.cc ('k') | ui/ozone/platform/test/ozone_platform_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/ozone/platform/egltest/ozone_platform_egltest.cc

diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc

index 67b7fd8addd2d1c02d1b68653b919030e15add8f..67c010cf5aaf2c017f1c78e8149932413fd9a91a 100644

--- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc

+++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc

@@ -26,7 +26,6 @@

#if defined(OS_CHROMEOS)

#include "ui/ozone/common/chromeos/native_display_delegate_ozone.h"

-#include "ui/ozone/common/chromeos/touchscreen_device_manager_ozone.h"

#endif

namespace ui {

@@ -343,11 +342,6 @@ class OzonePlatformEgltest : public OzonePlatform {

OVERRIDE {

return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateOzone());

}

- virtual scoped_ptr<TouchscreenDeviceManager>

- CreateTouchscreenDeviceManager() OVERRIDE {

- return scoped_ptr<TouchscreenDeviceManager>(

- new TouchscreenDeviceManagerOzone());

- }

#endif

virtual void InitializeUI() OVERRIDE {