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

Unified Diff: ui/display/chromeos/x11/native_display_delegate_x11.cc

Issue 223483002: base: Do not allow MessagePumpObservers to consume events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r262009 Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/clipboard/clipboard_aurax11.cc ('k') | ui/events/platform/x11/x11_event_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/x11/native_display_delegate_x11.cc
diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.cc b/ui/display/chromeos/x11/native_display_delegate_x11.cc
index bb80885783c3a69d1c212fab7557312e7c88e2d1..0703fc76e4ccdb8188df2f69cc9ffeb546d58f81 100644
--- a/ui/display/chromeos/x11/native_display_delegate_x11.cc
+++ b/ui/display/chromeos/x11/native_display_delegate_x11.cc
@@ -111,8 +111,7 @@ class NativeDisplayDelegateX11::MessagePumpObserverX11
virtual ~MessagePumpObserverX11();
// base::MessagePumpObserver overrides:
- virtual base::EventStatus WillProcessEvent(const base::NativeEvent& event)
- OVERRIDE;
+ virtual void WillProcessEvent(const base::NativeEvent& event) OVERRIDE;
virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
private:
@@ -127,8 +126,7 @@ NativeDisplayDelegateX11::MessagePumpObserverX11::MessagePumpObserverX11(
NativeDisplayDelegateX11::MessagePumpObserverX11::~MessagePumpObserverX11() {}
-base::EventStatus
-NativeDisplayDelegateX11::MessagePumpObserverX11::WillProcessEvent(
+void NativeDisplayDelegateX11::MessagePumpObserverX11::WillProcessEvent(
const base::NativeEvent& event) {
// XI_HierarchyChanged events are special. There is no window associated with
// these events. So process them directly from here.
@@ -139,8 +137,6 @@ NativeDisplayDelegateX11::MessagePumpObserverX11::WillProcessEvent(
// This also takes care of same event being received twice.
delegate_->NotifyDisplayObservers();
}
-
- return base::EVENT_CONTINUE;
}
void NativeDisplayDelegateX11::MessagePumpObserverX11::DidProcessEvent(
« no previous file with comments | « ui/base/clipboard/clipboard_aurax11.cc ('k') | ui/events/platform/x11/x11_event_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698