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

Index: ui/ozone/platform/dri/ozone_platform_gbm.cc

diff --git a/ui/ozone/platform/dri/ozone_platform_gbm.cc b/ui/ozone/platform/dri/ozone_platform_gbm.cc

index b23b2d49d932c30b2533f8fcfceba8051d7a7d3d..f053c16c2c271b50f64138ee789627cd5e96a569 100644

--- a/ui/ozone/platform/dri/ozone_platform_gbm.cc

+++ b/ui/ozone/platform/dri/ozone_platform_gbm.cc

@@ -33,7 +33,6 @@

#include "ui/ozone/public/ozone_switches.h"

#if defined(OS_CHROMEOS)

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

#include "ui/ozone/platform/dri/chromeos/display_message_handler.h"

#include "ui/ozone/platform/dri/chromeos/native_display_delegate_dri.h"

#include "ui/ozone/platform/dri/chromeos/native_display_delegate_proxy.h"

@@ -120,11 +119,6 @@ class OzonePlatformGbm : public OzonePlatform {

return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateProxy(

gpu_platform_support_host_.get(), device_manager_.get()));

}

- virtual scoped_ptr<TouchscreenDeviceManager>

- CreateTouchscreenDeviceManager() OVERRIDE {

- return scoped_ptr<TouchscreenDeviceManager>(

- new TouchscreenDeviceManagerOzone());

- }

#endif

virtual void InitializeUI() OVERRIDE {

vt_manager_.reset(new VirtualTerminalManager());