Remove views::KeyEvent, replacing uses of it with ui::KeyEvent.

ui/views/controls/button/custom_button.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/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
+#include "ui/base/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 // How long the hover animation takes if uninterrupted.
 static const int kHoverFadeDurationMs = 150;
 
 // static
@@ skipping 140 matching lines @@
   // Starting a drag results in a MouseExited, we need to ignore it.
   if (state_ != BS_DISABLED && !InDrag())
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnMouseMoved(const MouseEvent& event) {
   if (state_ != BS_DISABLED)
     SetState(HitTest(event.location()) ? BS_HOT : BS_NORMAL);
 }
 
-bool CustomButton::OnKeyPressed(const KeyEvent& event) {
+bool CustomButton::OnKeyPressed(const ui::KeyEvent& event) {
   if (state_ == BS_DISABLED)
     return false;
 
   // Space sets button state to pushed. Enter clicks the button. This matches
   // the Windows native behavior of buttons, where Space clicks the button on
   // KeyRelease and Enter clicks the button on KeyPressed.
   if (event.key_code() == ui::VKEY_SPACE) {
     SetState(BS_PUSHED);
   } else if (event.key_code() == ui::VKEY_RETURN) {
     SetState(BS_NORMAL);
-    NotifyClick(event);
+    // TODO(beng): remove once NotifyClick takes ui::Event.
+    views::MouseEvent synthetic_event(
+        ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+    NotifyClick(synthetic_event);
   } else {
     return false;
   }
   return true;
 }
 
-bool CustomButton::OnKeyReleased(const KeyEvent& event) {
+bool CustomButton::OnKeyReleased(const ui::KeyEvent& event) {
   if ((state_ == BS_DISABLED) || (event.key_code() != ui::VKEY_SPACE))
     return false;
 
   SetState(BS_NORMAL);
-  NotifyClick(event);
+  // TODO(beng): remove once NotifyClick takes ui::Event.
+  views::MouseEvent synthetic_event(
+      ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  NotifyClick(synthetic_event);
   return true;
 }
 
 ui::GestureStatus CustomButton::OnGestureEvent(const GestureEvent& event) {
   if (state_ == BS_DISABLED)
     return Button::OnGestureEvent(event);
 
   if (event.type() == ui::ET_GESTURE_TAP && IsTriggerableEvent(event)) {
     // Set the button state to hot and start the animation fully faded in. The
     // TAP_UP event issued immediately after will set the state to BS_NORMAL
     // beginning the fade out animation. See http://crbug.com/131184.
     SetState(BS_HOT);
     hover_animation_->Reset(1.0);
     NotifyClick(event);
     return ui::GESTURE_STATUS_CONSUMED;
   } else if (event.type() == ui::ET_GESTURE_TAP_DOWN &&
              ShouldEnterPushedState(event)) {
     SetState(BS_PUSHED);
     if (request_focus_on_press_)
       RequestFocus();
     return ui::GESTURE_STATUS_CONSUMED;
   } else {
     SetState(BS_NORMAL);
   }
   return Button::OnGestureEvent(event);
 }
 
 bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) {
   SetState(BS_NORMAL);
-  KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
-                     accelerator.modifiers());
-  NotifyClick(key_event);
+  /*
+  ui::KeyEvent key_event(ui::ET_KEY_RELEASED, accelerator.key_code(),
+                         accelerator.modifiers());
+                         */
+  // TODO(beng): remove once NotifyClick takes ui::Event.
+  views::MouseEvent synthetic_event(
+      ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_MOUSE_BUTTON);
+  NotifyClick(synthetic_event);
   return true;
 }
 
 void CustomButton::ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture) {
   if (!context_menu_controller())
     return;
 
   // We're about to show the context menu. Showing the context menu likely means
   // we won't get a mouse exited and reset state. Reset it now to be sure.
   if (state_ != BS_DISABLED)
@@ skipping 67 matching lines @@
   if (!is_add && state_ != BS_DISABLED)
     SetState(BS_NORMAL);
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
 }
 
 }  // namespace views