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

ui/aura/test/test_window_delegate.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/aura/test/test_window_delegate.h"
 
 #include "base/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
@@ skipping 84 matching lines @@
   return scoped_refptr<ui::Texture>();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ColorTestWindowDelegate
 
 ColorTestWindowDelegate::ColorTestWindowDelegate(SkColor color)
     : color_(color),
       last_key_code_(ui::VKEY_UNKNOWN) {
 }
+
 ColorTestWindowDelegate::~ColorTestWindowDelegate() {
 }
 
-ui::EventResult ColorTestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
+void ColorTestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
   last_key_code_ = event->key_code();
-  return ui::ER_HANDLED;
+  event->SetHandled();
 }
+
 void ColorTestWindowDelegate::OnWindowDestroyed() {
   delete this;
 }
+
 void ColorTestWindowDelegate::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawColor(color_, SkXfermode::kSrc_Mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MaskedWindowDelegate
 
 MaskedWindowDelegate::MaskedWindowDelegate(const gfx::Rect mask_rect)
     : mask_rect_(mask_rect) {
 }
@@ skipping 12 matching lines @@
 EventCountDelegate::EventCountDelegate()
   : mouse_enter_count_(0),
     mouse_move_count_(0),
     mouse_leave_count_(0),
     mouse_press_count_(0),
     mouse_release_count_(0),
     key_press_count_(0),
     key_release_count_(0) {
 }
 
-ui::EventResult EventCountDelegate::OnKeyEvent(ui::KeyEvent* event) {
+void EventCountDelegate::OnKeyEvent(ui::KeyEvent* event) {
   switch (event->type()) {
     case ui::ET_KEY_PRESSED:
       key_press_count_++;
       break;
     case ui::ET_KEY_RELEASED:
       key_release_count_++;
     default:
       break;
   }
-  return ui::ER_UNHANDLED;
 }
 
 ui::EventResult EventCountDelegate::OnMouseEvent(ui::MouseEvent* event) {
   switch (event->type()) {
     case ui::ET_MOUSE_MOVED:
       mouse_move_count_++;
       break;
     case ui::ET_MOUSE_ENTERED:
       mouse_enter_count_++;
       break;
@@ skipping 37 matching lines @@
   std::string result = StringPrintf("%d %d",
                                     key_press_count_,
                                     key_release_count_);
   key_press_count_ = 0;
   key_release_count_ = 0;
   return result;
 }
 
 }  // namespace test
 }  // namespace aura