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

Unified Diff: ui/base/clipboard/clipboard_aurax11.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/aura/window_tree_host_x11.cc ('k') | ui/display/chromeos/x11/native_display_delegate_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_aurax11.cc
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index f86e4a2ffdc74b1692fe70003293e108dd6dee39..c85c582d8506633024235ac684c369a5d2fd070c 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -73,8 +73,7 @@ class SelectionChangeObserver : public base::MessagePumpObserver {
virtual ~SelectionChangeObserver();
// Overridden from base::MessagePumpObserver:
- 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 {}
@@ -120,8 +119,7 @@ SelectionChangeObserver* SelectionChangeObserver::GetInstance() {
return Singleton<SelectionChangeObserver>::get();
}
-base::EventStatus SelectionChangeObserver::WillProcessEvent(
- const base::NativeEvent& event) {
+void SelectionChangeObserver::WillProcessEvent(const base::NativeEvent& event) {
if (event->type == event_base_ + XFixesSelectionNotify) {
XFixesSelectionNotifyEvent* ev =
reinterpret_cast<XFixesSelectionNotifyEvent*>(event);
@@ -133,7 +131,6 @@ base::EventStatus SelectionChangeObserver::WillProcessEvent(
DLOG(ERROR) << "Unexpected selection atom: " << ev->selection;
}
}
- return base::EVENT_CONTINUE;
}
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « ui/aura/window_tree_host_x11.cc ('k') | ui/display/chromeos/x11/native_display_delegate_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698