Consolidate message observer API for win and aura (and touch).

chrome/browser/chromeos/system_key_event_listener.cc

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 fd8a42832e68ddc43cf7e9761adc1f40bb4c9acf..d4cc4cb72982a4542275966c1c1cd19cf09cdaf9 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -176,10 +176,13 @@ void SystemKeyEventListener::ProcessWmMessage(const WmIpc::Message& message,
   }
 }
 
-#if defined(TOUCH_UI)
-base::MessagePumpObserver::EventStatus
-    SystemKeyEventListener::WillProcessXEvent(XEvent* xevent) {
-  return ProcessedXEvent(xevent) ? EVENT_HANDLED : EVENT_CONTINUE;
+#if defined(TOUCH_UI) || defined(USE_AURA)
+base::EventStatus SystemKeyEventListener::WillProcessEvent(
+    const base::NativeEvent& event) {
+  return ProcessedXEvent(event) ? EVENT_HANDLED : EVENT_CONTINUE;
+}
+
+void SystemKeyEventListener::DidProcessEvent(const NativeEvent& event) {
 }
 #else  // defined(TOUCH_UI)
 // static