Chromium Code Reviews| 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 0789c5b3b7579fe315d45844a11784c3542291c4..b8deefb6a3bf6ce313b6c54ec3ee3a7567b0e713 100644 |
| --- a/chrome/browser/chromeos/system_key_event_listener.cc |
| +++ b/chrome/browser/chromeos/system_key_event_listener.cc |
| @@ -151,11 +151,13 @@ 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& event) { |
|
msw
2011/09/27 03:51:42
Doesn't this NativeEvent need a namespace qualifie
oshima
2011/09/27 16:39:39
Done.
|
| return ProcessedXEvent(xevent) ? EVENT_HANDLED : EVENT_CONTINUE; |
| } |
| +void SystemKeyEventListener::DidProcessEvent(const NativeEvent& event) { |
|
msw
2011/09/27 03:51:42
Add a blank line between these functions.
oshima
2011/09/27 16:39:39
Done.
|
| +} |
| #else // defined(TOUCH_UI) |
| // static |
| GdkFilterReturn SystemKeyEventListener::GdkEventFilter(GdkXEvent* gxevent, |