| 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..8d8fa5a31c4df7049e9ec15fac842580525b0333 100644
|
| --- a/ui/display/chromeos/x11/display_configurator_x11.cc
|
| +++ b/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
|
|
|