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

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

Issue 667823002: PlatformEventDispatcher::DispatchEvent() should return a PostDispatchAction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui_enums
Patch Set: Fix platform_event_source_unittest.cc Created 6 years, 2 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_DESKTOP_HANDLER_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 // Checks if the current active window is |window|. 51 // Checks if the current active window is |window|.
52 bool IsActiveWindow(::Window window) const; 52 bool IsActiveWindow(::Window window) const;
53 53
54 // Processes activation/focus related events. Some of these events are 54 // Processes activation/focus related events. Some of these events are
55 // dispatched to the X11 window dispatcher, and not to the X11 root-window 55 // dispatched to the X11 window dispatcher, and not to the X11 root-window
56 // dispatcher. The window dispatcher sends these events to here. 56 // dispatcher. The window dispatcher sends these events to here.
57 void ProcessXEvent(XEvent* event); 57 void ProcessXEvent(XEvent* event);
58 58
59 // ui::PlatformEventDispatcher 59 // ui::PlatformEventDispatcher
60 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; 60 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
61 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; 61 virtual ui::PostDispatchAction DispatchEvent(
62 const ui::PlatformEvent& event) override;
62 63
63 // Overridden from aura::EnvObserver: 64 // Overridden from aura::EnvObserver:
64 virtual void OnWindowInitialized(aura::Window* window) override; 65 virtual void OnWindowInitialized(aura::Window* window) override;
65 virtual void OnWillDestroyEnv() override; 66 virtual void OnWillDestroyEnv() override;
66 67
67 private: 68 private:
68 enum ActiveState { 69 enum ActiveState {
69 ACTIVE, 70 ACTIVE,
70 NOT_ACTIVE 71 NOT_ACTIVE
71 }; 72 };
(...skipping 28 matching lines...) Expand all
100 ui::X11AtomCache atom_cache_; 101 ui::X11AtomCache atom_cache_;
101 102
102 bool wm_supports_active_window_; 103 bool wm_supports_active_window_;
103 104
104 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler); 105 DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler);
105 }; 106 };
106 107
107 } // namespace views 108 } // namespace views
108 109
109 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_ 110 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ('k') | ui/views/widget/desktop_aura/x11_desktop_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698