| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 45   // aura::WindowTreeHostX11: | 45   // aura::WindowTreeHostX11: | 
| 46   virtual void OnConfigureNotify() OVERRIDE; | 46   virtual void OnConfigureNotify() OVERRIDE; | 
| 47   virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; | 47   virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; | 
| 48   virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) | 48   virtual void TranslateAndDispatchLocatedEvent(ui::LocatedEvent* event) | 
| 49       OVERRIDE; | 49       OVERRIDE; | 
| 50 | 50 | 
| 51   // EnvObserver overrides. | 51   // EnvObserver overrides. | 
| 52   virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; | 52   virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; | 
| 53   virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; | 53   virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; | 
| 54 | 54 | 
|  | 55 #if defined(OS_CHROMEOS) | 
| 55   // Set the CrOS touchpad "tap paused" property. It is used to temporarily | 56   // Set the CrOS touchpad "tap paused" property. It is used to temporarily | 
| 56   // turn off the Tap-to-click feature when the mouse pointer is invisible. | 57   // turn off the Tap-to-click feature when the mouse pointer is invisible. | 
| 57   void SetCrOSTapPaused(bool state); | 58   void SetCrOSTapPaused(bool state); | 
|  | 59 #endif | 
| 58 | 60 | 
| 59   scoped_ptr<XID[]> pointer_barriers_; | 61   scoped_ptr<XID[]> pointer_barriers_; | 
| 60 | 62 | 
| 61   TransformerHelper transformer_helper_; | 63   TransformerHelper transformer_helper_; | 
| 62 | 64 | 
| 63   // The display IDs associated with this root window. | 65   // The display IDs associated with this root window. | 
| 64   // In single monitor or extended mode dual monitor case, the root window | 66   // In single monitor or extended mode dual monitor case, the root window | 
| 65   // is associated with one display. | 67   // is associated with one display. | 
| 66   // In mirror mode dual monitors case, the root window is associated with | 68   // In mirror mode dual monitors case, the root window is associated with | 
| 67   // both displays. | 69   // both displays. | 
| 68   std::pair<int64, int64> display_ids_; | 70   std::pair<int64, int64> display_ids_; | 
| 69 | 71 | 
| 70   DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); | 72   DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); | 
| 71 }; | 73 }; | 
| 72 | 74 | 
| 73 }  // namespace ash | 75 }  // namespace ash | 
| 74 | 76 | 
| 75 #endif  // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 77 #endif  // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 
| OLD | NEW | 
|---|