| 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 #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 5 #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| 6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/host/ash_window_tree_host.h" | 9 #include "ash/host/ash_window_tree_host.h" |
| 10 #include "ash/host/transformer_helper.h" | 10 #include "ash/host/transformer_helper.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 // EnvObserver overrides. | 47 // EnvObserver overrides. |
| 48 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; | 48 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; |
| 49 virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; | 49 virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; |
| 50 | 50 |
| 51 class TouchEventCalibrate; | 51 class TouchEventCalibrate; |
| 52 | 52 |
| 53 // Update is_internal_display_ based on the current state. | 53 // Update is_internal_display_ based on the current state. |
| 54 void UpdateIsInternalDisplay(); | 54 void UpdateIsInternalDisplay(); |
| 55 | 55 |
| 56 #if defined(OS_CHROMEOS) |
| 56 // Set the CrOS touchpad "tap paused" property. It is used to temporarily | 57 // Set the CrOS touchpad "tap paused" property. It is used to temporarily |
| 57 // turn off the Tap-to-click feature when the mouse pointer is invisible. | 58 // turn off the Tap-to-click feature when the mouse pointer is invisible. |
| 58 void SetCrOSTapPaused(bool state); | 59 void SetCrOSTapPaused(bool state); |
| 60 #endif |
| 59 | 61 |
| 60 // True if the root host resides on the internal display | 62 // True if the root host resides on the internal display |
| 61 bool is_internal_display_; | 63 bool is_internal_display_; |
| 62 | 64 |
| 63 scoped_ptr<XID[]> pointer_barriers_; | 65 scoped_ptr<XID[]> pointer_barriers_; |
| 64 | 66 |
| 65 scoped_ptr<TouchEventCalibrate> touch_calibrate_; | 67 scoped_ptr<TouchEventCalibrate> touch_calibrate_; |
| 66 | 68 |
| 67 TransformerHelper transformer_helper_; | 69 TransformerHelper transformer_helper_; |
| 68 | 70 |
| 69 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); | 71 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); |
| 70 }; | 72 }; |
| 71 | 73 |
| 72 } // namespace ash | 74 } // namespace ash |
| 73 | 75 |
| 74 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 76 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| OLD | NEW |