Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

ui/views/ime/input_method_win.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/ime/input_method_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "ui/base/event.h"
+#include "ui/base/events.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/views/events/event.h"
 
 // Extra number of chars before and after selection (or composition) range which
 // is returned to IME for improving conversion accuracy.
 static const size_t kExtraNumberOfChars = 20;
 
 namespace views {
 
 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate)
     : active_(false),
       direction_(base::i18n::UNKNOWN_DIRECTION),
@@ skipping 230 matching lines @@
 LRESULT InputMethodWin::OnChar(
     UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled) {
   *handled = TRUE;
 
   // We need to send character events to the focused text input client event if
   // its text input type is ui::TEXT_INPUT_TYPE_NONE.
   if (!GetTextInputClient())
     return 0;
 
   GetTextInputClient()->InsertChar(static_cast<char16>(wparam),
-                                   GetModifiersFromKeyState());
+                                   ui::GetModifiersFromKeyState());
   return 0;
 }
 
 LRESULT InputMethodWin::OnDeadChar(
     UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled) {
   *handled = TRUE;
 
   if (IsTextInputTypeNone())
     return 0;
 
@@ skipping 144 matching lines @@
     case ui::TEXT_INPUT_TYPE_PASSWORD:
       ime_input_.DisableIME(hwnd());
       break;
     default:
       ime_input_.EnableIME(hwnd());
       break;
   }
 }
 
 }  // namespace views