Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: trunk/src/ash/host/ash_window_tree_host_x11.h

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 // EnvObserver overrides. 49 // EnvObserver overrides.
50 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE; 50 virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
51 virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE; 51 virtual void OnHostInitialized(aura::WindowTreeHost* host) OVERRIDE;
52 52
53 class TouchEventCalibrate; 53 class TouchEventCalibrate;
54 54
55 // Update is_internal_display_ based on the current state. 55 // Update is_internal_display_ based on the current state.
56 void UpdateIsInternalDisplay(); 56 void UpdateIsInternalDisplay();
57 57
58 #if defined(OS_CHROMEOS)
59 // Set the CrOS touchpad "tap paused" property. It is used to temporarily 58 // Set the CrOS touchpad "tap paused" property. It is used to temporarily
60 // turn off the Tap-to-click feature when the mouse pointer is invisible. 59 // turn off the Tap-to-click feature when the mouse pointer is invisible.
61 void SetCrOSTapPaused(bool state); 60 void SetCrOSTapPaused(bool state);
62 #endif
63 61
64 // True if the root host resides on the internal display 62 // True if the root host resides on the internal display
65 bool is_internal_display_; 63 bool is_internal_display_;
66 64
67 scoped_ptr<XID[]> pointer_barriers_; 65 scoped_ptr<XID[]> pointer_barriers_;
68 66
69 scoped_ptr<TouchEventCalibrate> touch_calibrate_; 67 scoped_ptr<TouchEventCalibrate> touch_calibrate_;
70 68
71 TransformerHelper transformer_helper_; 69 TransformerHelper transformer_helper_;
72 70
73 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); 71 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11);
74 }; 72 };
75 73
76 } // namespace ash 74 } // namespace ash
77 75
78 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ 76 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc ('k') | trunk/src/ash/host/ash_window_tree_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698