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

ui/views/ime/input_method_win.cc

Index: ui/views/ime/input_method_win.cc
===================================================================
--- ui/views/ime/input_method_win.cc	(revision 151481)
+++ ui/views/ime/input_method_win.cc	(working copy)
@@ -8,10 +8,10 @@
 #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.
@@ -262,7 +262,7 @@
     return 0;
 
   GetTextInputClient()->InsertChar(static_cast<char16>(wparam),
-                                   GetModifiersFromKeyState());
+                                   ui::GetModifiersFromKeyState());
   return 0;
 }