| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/display/chromeos/display_configurator.h" | 5 #include "ui/display/chromeos/display_configurator.h" |
| 6 | 6 |
| 7 #include "ui/display/chromeos/touchscreen_delegate_impl.h" | |
| 8 #include "ui/display/chromeos/x11/native_display_delegate_x11.h" | 7 #include "ui/display/chromeos/x11/native_display_delegate_x11.h" |
| 9 #include "ui/display/chromeos/x11/touchscreen_device_manager_x11.h" | |
| 10 | 8 |
| 11 namespace ui { | 9 namespace ui { |
| 12 | 10 |
| 13 scoped_ptr<NativeDisplayDelegate> | 11 scoped_ptr<NativeDisplayDelegate> |
| 14 DisplayConfigurator::CreatePlatformNativeDisplayDelegate() { | 12 DisplayConfigurator::CreatePlatformNativeDisplayDelegate() { |
| 15 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()); | 13 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()); |
| 16 } | 14 } |
| 17 | 15 |
| 18 scoped_ptr<DisplayConfigurator::TouchscreenDelegate> | |
| 19 DisplayConfigurator::CreatePlatformTouchscreenDelegate() { | |
| 20 return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl( | |
| 21 scoped_ptr<TouchscreenDeviceManager>( | |
| 22 new TouchscreenDeviceManagerX11()))); | |
| 23 } | |
| 24 | |
| 25 } // namespace ui | 16 } // namespace ui |
| OLD | NEW |