Index: ui/views/focus/accelerator_handler_aura.cc |
diff --git a/ui/views/focus/accelerator_handler_aura.cc b/ui/views/focus/accelerator_handler_aura.cc |
index 274de1e7274a3565819a90a6c5f752b50dc35d65..f2f17b394999366a5e66d30e614d6b75bcbd8fee 100644 |
--- a/ui/views/focus/accelerator_handler_aura.cc |
+++ b/ui/views/focus/accelerator_handler_aura.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -9,21 +9,21 @@ namespace views { |
AcceleratorHandler::AcceleratorHandler() { |
} |
+base::DispatchStatus AcceleratorHandler::Dispatch( |
+ const base::NativeEvent& event) { |
#if defined(OS_WIN) |
-bool AcceleratorHandler::Dispatch(const MSG& msg) { |
- TranslateMessage(&msg); |
- DispatchMessage(&msg); |
- return true; |
-} |
+ TranslateMessage(&event); |
+ DispatchMessage(&event); |
+ return base::EVENT_PROCESSED; |
#else |
-base::MessagePumpDispatcher::DispatchStatus AcceleratorHandler::Dispatch( |
- XEvent*) { |
- return base::MessagePumpDispatcher::EVENT_IGNORED; |
+ return base::EVENT_IGNORED; |
+#endif // defined(OS_WIN) |
} |
+#if !defined(OS_WIN) |
bool DispatchXEvent(XEvent* xev) { |
return false; |
} |
-#endif // defined(OS_WIN) |
+#endif // !defined(OS_WIN) |
} // namespace views |