events: Update key-event handlers to not return EventResult.

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

 // 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.
 
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 526 matching lines @@
 scoped_refptr<ui::Texture> DesktopNativeWidgetAura::CopyTexture() {
   // The layer we create doesn't have an external texture, so this should never
   // get invoked.
   NOTREACHED();
   return scoped_refptr<ui::Texture>();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, ui::EventHandler implementation:
 
-ui::EventResult DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
+void DesktopNativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
   if (event->is_char()) {
     // If a ui::InputMethod object is attached to the root window, character
     // events are handled inside the object and are not passed to this function.
     // If such object is not attached, character events might be sent (e.g. on
     // Windows). In this case, we just skip these.
-    return ui::ER_UNHANDLED;
+    return;
   }
   // Renderer may send a key event back to us if the key event wasn't handled,
   // and the window may be invisible by that time.
   if (!window_->IsVisible())
-    return ui::ER_UNHANDLED;
+    return;
 
-  if (native_widget_delegate_->OnKeyEvent(*event))
-    return ui::ER_HANDLED;
+  native_widget_delegate_->OnKeyEvent(event);
+  if (event->handled())
+    return;
 
   if (GetWidget()->HasFocusManager() &&
       !GetWidget()->GetFocusManager()->OnKeyEvent(*event))
-    return ui::ER_HANDLED;
-
-  return ui::ER_UNHANDLED;
+    event->SetHandled();
 }
 
 ui::EventResult DesktopNativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
   DCHECK(window_->IsVisible());
   if (event->type() == ui::ET_MOUSEWHEEL) {
     return native_widget_delegate_->OnMouseEvent(*event) ?
         ui::ER_HANDLED : ui::ER_UNHANDLED;
   }
 
   return native_widget_delegate_->OnMouseEvent(*event) ?
@@ skipping 86 matching lines @@
         aura::client::GetFocusClient(window_)->GetFocusedWindow());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, views::internal::InputMethodDelegate:
 
 void DesktopNativeWidgetAura::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
   FocusManager* focus_manager =
       native_widget_delegate_->AsWidget()->GetFocusManager();
-  if (native_widget_delegate_->OnKeyEvent(key) || !focus_manager)
+  native_widget_delegate_->OnKeyEvent(const_cast<ui::KeyEvent*>(&key));
+  if (key.handled() || !focus_manager)
     return;
   focus_manager->OnKeyEvent(key);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, aura::WindowDragDropDelegate implementation:
 
 void DesktopNativeWidgetAura::OnDragEntered(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   last_drop_operation_ = drop_helper_->OnDragOver(event.data(),
@@ skipping 12 matching lines @@
   drop_helper_->OnDragExit();
 }
 
 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   return drop_helper_->OnDrop(event.data(), event.location(),
       last_drop_operation_);
 }
 
 }  // namespace views