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

Side by Side Diff: ui/views/test/x11_property_change_waiter.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 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 UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ 5 #ifndef UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
6 #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ 6 #define UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/events/platform/platform_event_dispatcher.h" 10 #include "ui/events/platform/platform_event_dispatcher.h"
(...skipping 20 matching lines...) Expand all
31 // Returns whether the run loop can exit. 31 // Returns whether the run loop can exit.
32 virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event); 32 virtual bool ShouldKeepOnWaiting(const ui::PlatformEvent& event);
33 33
34 XID xwindow() const { 34 XID xwindow() const {
35 return x_window_; 35 return x_window_;
36 } 36 }
37 37
38 private: 38 private:
39 // ui::PlatformEventDispatcher: 39 // ui::PlatformEventDispatcher:
40 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; 40 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
41 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; 41 virtual ui::PostDispatchAction DispatchEvent(
42 const ui::PlatformEvent& event) override;
42 43
43 XID x_window_; 44 XID x_window_;
44 const char* property_; 45 const char* property_;
45 46
46 // Whether Wait() should block. 47 // Whether Wait() should block.
47 bool wait_; 48 bool wait_;
48 49
49 // Ends the run loop. 50 // Ends the run loop.
50 base::Closure quit_closure_; 51 base::Closure quit_closure_;
51 52
52 // The event mask to be restored upon X11PropertyChangeWaiter's destruction. 53 // The event mask to be restored upon X11PropertyChangeWaiter's destruction.
53 long old_event_mask_; 54 long old_event_mask_;
54 55
55 scoped_ptr<ui::ScopedEventDispatcher> dispatcher_; 56 scoped_ptr<ui::ScopedEventDispatcher> dispatcher_;
56 57
57 scoped_ptr<ui::X11AtomCache> atom_cache_; 58 scoped_ptr<ui::X11AtomCache> atom_cache_;
58 59
59 DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter); 60 DISALLOW_COPY_AND_ASSIGN(X11PropertyChangeWaiter);
60 }; 61 };
61 62
62 } // namespace views 63 } // namespace views
63 64
64 #endif // UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_ 65 #endif // UI_VIEWS_TEST_X11_PROPERTY_CHANGE_WAITER_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_event_dispatcher_linux.cc ('k') | ui/views/test/x11_property_change_waiter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698