| Index: ui/views/controls/textfield/native_textfield_win.cc
|
| diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
|
| index c35b89c4fce3032c38157ff9f3f319f114abb62d..b01e72ff471dfcc6142f3b4ffef831512cd35d8f 100644
|
| --- a/ui/views/controls/textfield/native_textfield_win.cc
|
| +++ b/ui/views/controls/textfield/native_textfield_win.cc
|
| @@ -17,7 +17,6 @@
|
| #include "ui/base/accessibility/accessible_view_state.h"
|
| #include "ui/base/clipboard/clipboard.h"
|
| #include "ui/base/clipboard/scoped_clipboard_writer.h"
|
| -#include "ui/base/keycodes/keyboard_code_conversion_win.h"
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/l10n/l10n_util_win.h"
|
| @@ -29,7 +28,6 @@
|
| #include "ui/views/controls/menu/menu_model_adapter.h"
|
| #include "ui/views/controls/menu/menu_runner.h"
|
| #include "ui/views/controls/native/native_view_host.h"
|
| -#include "ui/views/controls/textfield/native_textfield_views.h"
|
| #include "ui/views/controls/textfield/textfield.h"
|
| #include "ui/views/controls/textfield/textfield_controller.h"
|
| #include "ui/views/focus/focus_manager.h"
|
| @@ -152,25 +150,6 @@ bool NativeTextfieldWin::IsDoubleClick(const POINT& origin,
|
| (abs(current.y - origin.y) <= (GetSystemMetrics(SM_CYDOUBLECLK) / 2));
|
| }
|
|
|
| -// static
|
| -bool NativeTextfieldWin::IsNumPadDigit(int key_code, bool extended_key) {
|
| - if (key_code >= VK_NUMPAD0 && key_code <= VK_NUMPAD9)
|
| - return true;
|
| -
|
| - // Check for num pad keys without NumLock.
|
| - // Note: there is no easy way to know if a the key that was pressed comes from
|
| - // the num pad or the rest of the keyboard. Investigating how
|
| - // TranslateMessage() generates the WM_KEYCHAR from an
|
| - // ALT + <NumPad sequences> it appears it looks at the extended key flag
|
| - // (which is on if the key pressed comes from one of the 3 clusters to
|
| - // the left of the numeric keypad). So we use it as well.
|
| - return !extended_key &&
|
| - ((key_code >= VK_PRIOR && key_code <= VK_DOWN) || // All keys but 5
|
| - // and 0.
|
| - (key_code == VK_CLEAR) || // Key 5.
|
| - (key_code == VK_INSERT)); // Key 0.
|
| -}
|
| -
|
| void NativeTextfieldWin::AttachHack() {
|
| // See the code in textfield.cc that calls this for why this is here.
|
| container_view_->set_focus_view(textfield_);
|
| @@ -1206,17 +1185,4 @@ void NativeTextfieldWin::BuildContextMenu() {
|
| IDS_APP_SELECT_ALL);
|
| }
|
|
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -// NativeTextfieldWrapper, public:
|
| -
|
| -// static
|
| -NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
|
| - Textfield* field) {
|
| -#if defined(USE_AURA)
|
| - return new NativeTextfieldViews(field);
|
| -#else
|
| - return new NativeTextfieldWin(field);
|
| -#endif
|
| -}
|
| -
|
| } // namespace views
|
|
|