ui/ozone/platform/test/ozone_platform_test.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/test/ozone_platform_test.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/egltest/ozone_platform_egltest.cc ('k') | ui/ozone/public/ozone_platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/ozone/platform/test/ozone_platform_test.cc

diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc

index 9bcaefee94b5777a1bf930aa731886a96a397484..01f3a1722e9fda4aae444e9f271c9a93609d134e 100644

--- a/ui/ozone/platform/test/ozone_platform_test.cc

+++ b/ui/ozone/platform/test/ozone_platform_test.cc

@@ -18,7 +18,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 {

@@ -58,11 +57,6 @@ class OzonePlatformTest : 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 {