events: Start changing EventHandler interface to not return a value.

ui/views/corewm/focus_controller_unittest.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/corewm/focus_controller.h"
 
 #include <map>
 
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/root_window.h"
@@ skipping 24 matching lines @@
 
   void set_result(ui::EventResult result) { result_ = result; }
 
   int GetCountForEventType(int event_type) {
     std::map<int, int>::const_iterator it = event_counts_.find(event_type);
     return it != event_counts_.end() ? it->second : 0;
   }
 
  private:
   // Overridden from ui::EventHandler:
-  virtual ui::EventResult OnEvent(ui::Event* event) OVERRIDE {
+  virtual void OnEvent(ui::Event* event) OVERRIDE {
     event_counts_[event->type()] += 1;
-    return result_;
+    if (result_ & ui::ER_CONSUMED)
+      event->StopPropagation();
+    else if (result_ & ui::ER_HANDLED)
+      event->SetHandled();
   }
 
   // Overridden from aura::WindowObserver:
   virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {
     DCHECK_EQ(window, window_);
     RemoveObserver();
   }
 
   void RemoveObserver() {
     if (window_) {
@@ skipping 671 matching lines @@
 DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusToChildOfInactiveWindow);
 
 // - Verifies that FocusRules determine what can be focused.
 ALL_FOCUS_TESTS(FocusRulesOverride);
 
 // - Verifies that FocusRules determine what can be activated.
 TARGET_FOCUS_TESTS(ActivationRulesOverride);
 
 }  // namespace corewm
 }  // namespace views