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

Unified Diff: chrome/browser/chromeos/system_key_event_listener.cc

Issue 8021009: Consolidate message observer API for win and aura (and touch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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
Index: chrome/browser/chromeos/system_key_event_listener.cc
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 6c2001dc9c0dca77bae5dfb61bd9443540b6285b..9745a58f88c5adeae5cf12ef82ab3cd5dd57616e 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -138,9 +138,9 @@ void SystemKeyEventListener::ProcessWmMessage(const WmIpc::Message& message,
}
}
-#if defined(TOUCH_UI)
-base::MessagePumpObserver::EventStatus
- SystemKeyEventListener::WillProcessXEvent(XEvent* xevent) {
+#if defined(TOUCH_UI) || defined(USE_AURA)
+base::EventStatus SystemKeyEventListener::WillProcessEvent(
+ const NativeEvent xevent) {
return ProcessedXEvent(xevent) ? EVENT_HANDLED : EVENT_CONTINUE;
}
#else // defined(TOUCH_UI)

Powered by Google App Engine
This is Rietveld 408576698