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

Side by Side Diff: ui/views/widget/x11_window_event_filter.h

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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
« no previous file with comments | « ui/ui.gyp ('k') | ui/views/widget/x11_window_event_filter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_ 5 #ifndef UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_
6 #define UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_ 6 #define UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 9 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
10 #undef RootWindow 10 #undef RootWindow
(...skipping 22 matching lines...) Expand all
33 virtual ~X11WindowEventFilter(); 33 virtual ~X11WindowEventFilter();
34 34
35 // Changes whether borders are shown on this |root_window|. 35 // Changes whether borders are shown on this |root_window|.
36 void SetUseHostWindowBorders(bool use_os_border); 36 void SetUseHostWindowBorders(bool use_os_border);
37 37
38 // Overridden from EventFilter: 38 // Overridden from EventFilter:
39 virtual bool PreHandleKeyEvent(aura::Window* target, 39 virtual bool PreHandleKeyEvent(aura::Window* target,
40 ui::KeyEvent* event) OVERRIDE; 40 ui::KeyEvent* event) OVERRIDE;
41 virtual bool PreHandleMouseEvent(aura::Window* target, 41 virtual bool PreHandleMouseEvent(aura::Window* target,
42 ui::MouseEvent* event) OVERRIDE; 42 ui::MouseEvent* event) OVERRIDE;
43 virtual ui::TouchStatus PreHandleTouchEvent( 43 virtual ui::EventResult PreHandleTouchEvent(
44 aura::Window* target, 44 aura::Window* target,
45 ui::TouchEvent* event) OVERRIDE; 45 ui::TouchEvent* event) OVERRIDE;
46 virtual ui::EventResult PreHandleGestureEvent( 46 virtual ui::EventResult PreHandleGestureEvent(
47 aura::Window* target, 47 aura::Window* target,
48 ui::GestureEvent* event) OVERRIDE; 48 ui::GestureEvent* event) OVERRIDE;
49 49
50 private: 50 private:
51 // Dispatches a _NET_WM_MOVERESIZE message to the window manager to tell it 51 // Dispatches a _NET_WM_MOVERESIZE message to the window manager to tell it
52 // to act as if a border or titlebar drag occurred. 52 // to act as if a border or titlebar drag occurred.
53 bool DispatchHostWindowDragMovement(int hittest, 53 bool DispatchHostWindowDragMovement(int hittest,
(...skipping 12 matching lines...) Expand all
66 66
67 // True if |xwindow_| is the current _NET_ACTIVE_WINDOW. 67 // True if |xwindow_| is the current _NET_ACTIVE_WINDOW.
68 bool is_active_; 68 bool is_active_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(X11WindowEventFilter); 70 DISALLOW_COPY_AND_ASSIGN(X11WindowEventFilter);
71 }; 71 };
72 72
73 } // namespace views 73 } // namespace views
74 74
75 #endif // UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_ 75 #endif // UI_VIEWS_WIDGET_X11_WINDOW_EVENT_FILTER_H_
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | ui/views/widget/x11_window_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698