| 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" | 7 #include "ui/display/chromeos/touchscreen_delegate_impl.h" |
| 8 #include "ui/display/types/chromeos/native_display_delegate.h" | 8 #include "ui/display/types/chromeos/native_display_delegate.h" |
| 9 #include "ui/display/types/chromeos/touchscreen_device_manager.h" | 9 #include "ui/display/types/chromeos/touchscreen_device_manager.h" |
| 10 #include "ui/ozone/ozone_platform.h" | 10 #include "ui/ozone/ozone_platform.h" |
| 11 | 11 |
| 12 namespace ui { | 12 namespace ui { |
| 13 | 13 |
| 14 void DisplayConfigurator::PlatformInitialize() { | 14 scoped_ptr<NativeDisplayDelegate> |
| 15 InitializeDelegates( | 15 DisplayConfigurator::CreatePlatformNativeDisplayDelegate() { |
| 16 ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(), | 16 return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(); |
| 17 scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl( | 17 } |
| 18 ui::OzonePlatform::GetInstance()->CreateTouchscreenDeviceManager()))); | 18 |
| 19 scoped_ptr<DisplayConfigurator::TouchscreenDelegate> |
| 20 DisplayConfigurator::CreatePlatformTouchscreenDelegate() { |
| 21 return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl( |
| 22 ui::OzonePlatform::GetInstance()->CreateTouchscreenDeviceManager())); |
| 19 } | 23 } |
| 20 | 24 |
| 21 } // namespace ui | 25 } // namespace ui |
| OLD | NEW |