Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1018)

Unified Diff: services/ui/input_devices/input_device_server.cc

Issue 2897863004: Revert of chromeos: adds TouchDeviceServer and wires up in mushrome (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « services/ui/input_devices/input_device_server.h ('k') | services/ui/input_devices/touch_device_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/input_devices/input_device_server.cc
diff --git a/services/ui/input_devices/input_device_server.cc b/services/ui/input_devices/input_device_server.cc
index 5f5a5da271d500feac0acf1636592c655eee7c61..a4cc9016eeec9f37045f209b43abc38e47ad9a5b 100644
--- a/services/ui/input_devices/input_device_server.cc
+++ b/services/ui/input_devices/input_device_server.cc
@@ -12,17 +12,9 @@
#include "ui/events/devices/input_device.h"
#include "ui/events/devices/touchscreen_device.h"
-#if defined(OS_CHROMEOS)
-#include "services/ui/input_devices/touch_device_server.h"
-#endif
-
namespace ui {
-InputDeviceServer::InputDeviceServer() {
-#if defined(OS_CHROMEOS)
- touch_device_server_ = base::MakeUnique<TouchDeviceServer>();
-#endif
-}
+InputDeviceServer::InputDeviceServer() {}
InputDeviceServer::~InputDeviceServer() {
if (manager_ && ui::DeviceDataManager::HasInstance()) {
@@ -48,9 +40,6 @@
registry->AddInterface<mojom::InputDeviceServer>(
base::Bind(&InputDeviceServer::BindInputDeviceServerRequest,
base::Unretained(this)));
-#if defined(OS_CHROMEOS)
- touch_device_server_->AddInterface(registry);
-#endif
}
void InputDeviceServer::AddObserver(
« no previous file with comments | « services/ui/input_devices/input_device_server.h ('k') | services/ui/input_devices/touch_device_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698