| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H | 5 #ifndef ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H_ |
| 6 #define ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H | 6 #define ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "ash/display/mouse_warp_controller.h" | 8 #include "ash/display/mouse_warp_controller.h" |
| 9 | 9 |
| 10 #include "base/gtest_prod_util.h" | |
| 11 #include "ui/gfx/geometry/rect.h" | 10 #include "ui/gfx/geometry/rect.h" |
| 12 | 11 |
| 13 namespace aura { | 12 namespace aura { |
| 14 class Window; | 13 class Window; |
| 15 } | 14 } |
| 16 | 15 |
| 17 namespace gfx { | 16 namespace gfx { |
| 18 class Point; | 17 class Point; |
| 19 } | 18 } |
| 20 | 19 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 54 |
| 56 int64 current_cursor_display_id_; | 55 int64 current_cursor_display_id_; |
| 57 | 56 |
| 58 bool update_location_for_test_; | 57 bool update_location_for_test_; |
| 59 | 58 |
| 60 DISALLOW_COPY_AND_ASSIGN(UnifiedMouseWarpController); | 59 DISALLOW_COPY_AND_ASSIGN(UnifiedMouseWarpController); |
| 61 }; | 60 }; |
| 62 | 61 |
| 63 } // namespace ash | 62 } // namespace ash |
| 64 | 63 |
| 65 #endif // ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H | 64 #endif // ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H_ |
| OLD | NEW |