Allowing the client to handle escape and keyup events.

Review URL: http://codereview.chromium.org/99293

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15142 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 6 deletions

diff --git a/chrome/views/widget/accelerator_handler.cc b/chrome/views/widget/accelerator_handler.cc
index 39b17f8..b7f9cb4 100644
--- a/chrome/views/widget/accelerator_handler.cc
+++ b/chrome/views/widget/accelerator_handler.cc
@@ -13,17 +13,28 @@ AcceleratorHandler::AcceleratorHandler() {
 
 bool AcceleratorHandler::Dispatch(const MSG& msg) {
   bool process_message = true;
-  if ((msg.message == WM_KEYDOWN) || (msg.message == WM_SYSKEYDOWN)) {
+
+  if (msg.message >= WM_KEYFIRST && msg.message <= WM_KEYLAST) {
     FocusManager* focus_manager = FocusManager::GetFocusManager(msg.hwnd);
     if (focus_manager) {
-      // FocusManager::OnKeyDown returns false if this message has been
-      // consumed and should not be propogated further
-      if (!focus_manager->OnKeyDown(msg.hwnd, msg.message, msg.wParam,
-                                    msg.lParam)) {
-        process_message = false;
+      // FocusManager::OnKeyDown and OnKeyUp return false if this message has
+      // been consumed and should not be propagated further.
+      switch (msg.message) {
+        case WM_KEYDOWN:
+        case WM_SYSKEYDOWN:
+          process_message = focus_manager->OnKeyDown(msg.hwnd, msg.message,
+              msg.wParam, msg.lParam);
+          break;
+
+        case WM_KEYUP:
+        case WM_SYSKEYUP:
+          process_message = focus_manager->OnKeyUp(msg.hwnd, msg.message,
+              msg.wParam, msg.lParam);
+          break;
       }
     }
   }
+
   if (process_message) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);