| 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 <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) override; | 50 void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) override; |
| 51 | 51 |
| 52 // EnvObserver overrides. | 52 // EnvObserver overrides. |
| 53 void OnWindowInitialized(aura::Window* window) override; | 53 void OnWindowInitialized(aura::Window* window) override; |
| 54 void OnHostInitialized(aura::WindowTreeHost* host) override; | 54 void OnHostInitialized(aura::WindowTreeHost* host) override; |
| 55 | 55 |
| 56 // ui::internal::InputMethodDelegate: | 56 // ui::internal::InputMethodDelegate: |
| 57 ui::EventDispatchDetails DispatchKeyEventPostIME( | 57 ui::EventDispatchDetails DispatchKeyEventPostIME( |
| 58 ui::KeyEvent* event) override; | 58 ui::KeyEvent* event) override; |
| 59 | 59 |
| 60 #if defined(OS_CHROMEOS) | |
| 61 // Set the CrOS touchpad "tap paused" property. It is used to temporarily | 60 // Set the CrOS touchpad "tap paused" property. It is used to temporarily |
| 62 // turn off the Tap-to-click feature when the mouse pointer is invisible. | 61 // turn off the Tap-to-click feature when the mouse pointer is invisible. |
| 63 void SetCrOSTapPaused(bool state); | 62 void SetCrOSTapPaused(bool state); |
| 64 #endif | |
| 65 | 63 |
| 66 std::unique_ptr<XID[]> pointer_barriers_; | 64 std::unique_ptr<XID[]> pointer_barriers_; |
| 67 | 65 |
| 68 TransformerHelper transformer_helper_; | 66 TransformerHelper transformer_helper_; |
| 69 | 67 |
| 70 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); | 68 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); |
| 71 }; | 69 }; |
| 72 | 70 |
| 73 } // namespace ash | 71 } // namespace ash |
| 74 | 72 |
| 75 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 73 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2689143002:
ash: Remove OS_CHROMEOS ifdefs from accelerator files (Closed)
