Replace Textfield::Keystroke with views::KeyEvent

views/controls/textfield/native_textfield_win.cc

 // Copyright (c) 2010 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/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/keyboard_codes.h"
+#include "app/keyboard_code_conversion_win.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
@@ skipping 847 matching lines @@
 
 void NativeTextfieldWin::HandleKeystroke(UINT message,
                                          TCHAR key,
                                          UINT repeat_count,
                                          UINT flags) {
   ScopedFreeze freeze(this, GetTextObjectModel());
 
   Textfield::Controller* controller = textfield_->GetController();
   bool handled = false;
   if (controller) {
-    handled = controller->HandleKeystroke(textfield_,
-        Textfield::Keystroke(message, key, repeat_count, flags));
+    Event::EventType type;
+    switch (message) {
+      case WM_KEYDOWN:
+        type = Event::ET_KEY_PRESSED;
+        break;
+      case WM_KEYUP:
+        type = Event::ET_KEY_RELEASED;
+        break;
+      case WM_CHAR:
+        type = Event::ET_UNKNOWN;

[oshima, 2011/01/04 20:26:34]

I need your advice here. Event::EventType does not have a corresponding even
type for WM_CHAR. ET_UNKNOWN works as the typeis not used when message() is
used, but this is hacky/error prone and I prefer to have correct impl.
What would you suggest?

[Ben Goodger (Google), 2011/01/05 17:35:12]

According to SDK docs, WM_CHAR is synthesized when TranslateMessage translates a
WM_KEYDOWN message. I would infer from that that you can just use
ET_KEY_PRESSED.

+        break;
+      default:
+        NOTREACHED() << "Unknown message:" << message;
+        // pass through to avoid crash on release build.
+        type = Event::ET_KEY_PRESSED;
+    }
+    KeyEvent key_event(type,
+                       app::KeyboardCodeForWindowsKeyCode(key),
+                       KeyEvent::GetKeyStateFlags(),
+                       repeat_count,
+                       flags,
+                       message);
+    handled = controller->HandleKeyEvent(textfield_, key_event);
   }
 
   if (!handled) {
     OnBeforePossibleChange();
 
     if (key == app::VKEY_HOME || key == app::VKEY_END) {
       // DefWindowProc() might reset the keyboard layout when it receives a
       // keydown event for VKEY_HOME or VKEY_END. When the window was created
       // with WS_EX_LAYOUTRTL and the current keyboard layout is not a RTL one,
       // if the input text is pure LTR text, the layout changes to the first RTL
@@ skipping 181 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views