Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / display / chromeos / x11 / display_configurator_x11.cc

diff --git a/src/ui/display/chromeos/x11/display_configurator_x11.cc b/src/ui/display/chromeos/x11/display_configurator_x11.cc
index 6e6b59f..8d8fa5a 100644 (file)
--- a/src/ui/display/chromeos/x11/display_configurator_x11.cc
+++ b/src/ui/display/chromeos/x11/display_configurator_x11.cc
@@ -10,12 +10,16 @@
 
 namespace ui {
 
-void DisplayConfigurator::PlatformInitialize() {
-  InitializeDelegates(
-      scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()),
-      scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
-          scoped_ptr<TouchscreenDeviceManager>(
-              new TouchscreenDeviceManagerX11()))));
+scoped_ptr<NativeDisplayDelegate>
+DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {
+  return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11());
+}
+
+scoped_ptr<DisplayConfigurator::TouchscreenDelegate>
+DisplayConfigurator::CreatePlatformTouchscreenDelegate() {
+  return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
+      scoped_ptr<TouchscreenDeviceManager>(
+          new TouchscreenDeviceManagerX11())));
 }
 
 }  // namespace ui