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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/display/chromeos/x11/display_configurator_x11.cc

Issue 336863002: Moving input device hotplug event processing outside of ui/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« ash/touch/touch_transformer_controller.cc ('K') | « ui/display/chromeos/ozone/display_configurator_ozone.cc ('k') | ui/display/display.gyp » ('j') | ui/events/device_data_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/x11/display_configurator_x11.cc
diff --git a/ui/display/chromeos/x11/display_configurator_x11.cc b/ui/display/chromeos/x11/display_configurator_x11.cc
index 6e6b59fa41c362410733a4779109640e8188c2c2..4d430673efc3a0812188de04b68b27789a3c53d2 100644
--- a/ui/display/chromeos/x11/display_configurator_x11.cc
+++ b/ui/display/chromeos/x11/display_configurator_x11.cc
@@ -4,18 +4,13 @@
#include "ui/display/chromeos/display_configurator.h"
-#include "ui/display/chromeos/touchscreen_delegate_impl.h"
#include "ui/display/chromeos/x11/native_display_delegate_x11.h"
-#include "ui/display/chromeos/x11/touchscreen_device_manager_x11.h"
namespace ui {
void DisplayConfigurator::PlatformInitialize() {
InitializeDelegates(
- scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()),
- scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
- scoped_ptr<TouchscreenDeviceManager>(
- new TouchscreenDeviceManagerX11()))));
+ scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()));
}
} // namespace ui
« ash/touch/touch_transformer_controller.cc ('K') | « ui/display/chromeos/ozone/display_configurator_ozone.cc ('k') | ui/display/display.gyp » ('j') | ui/events/device_data_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698