| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mojo/display/display_type_converters.h" | 5 #include "ui/mojo/display/display_type_converters.h" |
| 6 | 6 |
| 7 #include "mojo/converters/geometry/geometry_type_converters.h" | |
| 8 #include "ui/display/display.h" | 7 #include "ui/display/display.h" |
| 8 #include "ui/gfx/geometry/mojo/geometry_type_converters.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| 11 | 11 |
| 12 // static | 12 // static |
| 13 display::Display | 13 display::Display |
| 14 TypeConverter<display::Display, mus::mojom::DisplayPtr>::Convert( | 14 TypeConverter<display::Display, mus::mojom::DisplayPtr>::Convert( |
| 15 const mus::mojom::DisplayPtr& input) { | 15 const mus::mojom::DisplayPtr& input) { |
| 16 if (input.is_null()) | 16 if (input.is_null()) |
| 17 return display::Display(); | 17 return display::Display(); |
| 18 | 18 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 result.set_touch_support(display::Display::TOUCH_SUPPORT_AVAILABLE); | 51 result.set_touch_support(display::Display::TOUCH_SUPPORT_AVAILABLE); |
| 52 break; | 52 break; |
| 53 case mus::mojom::TouchSupport::UNAVAILABLE: | 53 case mus::mojom::TouchSupport::UNAVAILABLE: |
| 54 result.set_touch_support(display::Display::TOUCH_SUPPORT_UNAVAILABLE); | 54 result.set_touch_support(display::Display::TOUCH_SUPPORT_UNAVAILABLE); |
| 55 break; | 55 break; |
| 56 } | 56 } |
| 57 return result; | 57 return result; |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace mojo | 60 } // namespace mojo |
| OLD | NEW |