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

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

Issue 2914103002: Remove usages of XInternAtom (Closed)
Patch Set: Address sadrul and sergeyu comments Created 3 years, 6 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
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_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_
7 7
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "ui/events/event_handler.h" 13 #include "ui/events/event_handler.h"
14 #include "ui/gfx/x/x11_atom_cache.h"
15 #include "ui/gfx/x/x11_types.h" 14 #include "ui/gfx/x/x11_types.h"
16 #include "ui/views/views_export.h" 15 #include "ui/views/views_export.h"
17 16
18 namespace aura { 17 namespace aura {
19 class Window; 18 class Window;
20 } 19 }
21 20
22 namespace gfx { 21 namespace gfx {
23 class Point; 22 class Point;
24 } 23 }
(...skipping 25 matching lines...) Expand all
50 bool DispatchHostWindowDragMovement(int hittest, 49 bool DispatchHostWindowDragMovement(int hittest,
51 const gfx::Point& screen_location); 50 const gfx::Point& screen_location);
52 51
53 // The display and the native X window hosting the root window. 52 // The display and the native X window hosting the root window.
54 XDisplay* xdisplay_; 53 XDisplay* xdisplay_;
55 ::Window xwindow_; 54 ::Window xwindow_;
56 55
57 // The native root window. 56 // The native root window.
58 ::Window x_root_window_; 57 ::Window x_root_window_;
59 58
60 ui::X11AtomCache atom_cache_;
61
62 DesktopWindowTreeHost* window_tree_host_; 59 DesktopWindowTreeHost* window_tree_host_;
63 60
64 // The non-client component for the target of a MouseEvent. Mouse events can 61 // The non-client component for the target of a MouseEvent. Mouse events can
65 // be destructive to the window tree, which can cause the component of a 62 // be destructive to the window tree, which can cause the component of a
66 // ui::EF_IS_DOUBLE_CLICK event to no longer be the same as that of the 63 // ui::EF_IS_DOUBLE_CLICK event to no longer be the same as that of the
67 // initial click. Acting on a double click should only occur for matching 64 // initial click. Acting on a double click should only occur for matching
68 // components. 65 // components.
69 int click_component_; 66 int click_component_;
70 67
71 DISALLOW_COPY_AND_ASSIGN(X11WindowEventFilter); 68 DISALLOW_COPY_AND_ASSIGN(X11WindowEventFilter);
72 }; 69 };
73 70
74 } // namespace views 71 } // namespace views
75 72
76 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_ 73 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_WINDOW_EVENT_FILTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698