Consolidate/cleanup event cracking code; single out GdkEvents.

views/controls/textfield/textfield.cc

 // Copyright (c) 2011 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 "views/controls/textfield/textfield.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdkkeysyms.h>
 #endif
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/insets.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #elif defined(OS_WIN)
 #include "base/win/win_util.h"
+#include "ui/base/win/event_util.h"
 // TODO(beng): this should be removed when the OS_WIN hack from
 // ViewHierarchyChanged is removed.
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/native_textfield_win.h"
-#include "views/events/event_utils_win.h"
 #endif
 
 namespace views {
 
 // static
 const char Textfield::kViewClassName[] = "views/Textfield";
 
 /////////////////////////////////////////////////////////////////////////////
 // Textfield
 
@@ skipping 290 matching lines @@
   ui::KeyboardCode key = e.key_code();
   if (key == ui::VKEY_BACK)
     return true;  // We'll handle BackSpace ourselves.
 
 #if defined(USE_AURA)
   NOTIMPLEMENTED();
 #elif defined(OS_WIN)
   // We don't translate accelerators for ALT + NumPad digit on Windows, they are
   // used for entering special characters.  We do translate alt-home.
   if (e.IsAltDown() && (key != ui::VKEY_HOME) &&
-      NativeTextfieldWin::IsNumPadDigit(key, IsExtendedKey(e)))
+      NativeTextfieldWin::IsNumPadDigit(key,
+                                        ui::IsExtendedKey(e.native_event())))
     return true;
 #endif
   return false;
 }
 
 void Textfield::OnPaintBackground(gfx::Canvas* canvas) {
   // Overridden to be public - gtk_views_entry.cc wants to call it.
   View::OnPaintBackground(canvas);
 }
 
@@ skipping 78 matching lines @@
     }
 #endif
   }
 }
 
 std::string Textfield::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views