Try to make TextField::Controller implementors cross-platform by abstracting

away the keystroke message that is passed. It turns out implementoars only ever
check for enter and escape messages, so I wrote two functions in TextField
that will decode the new Keyboard event.

This design is not optimal. Ideally we would have something more like the
WebInputEvent so that callers can check for anything in a cross-platform way.

This was branched off from the original review:
http://codereview.chromium.org/113639

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16577 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 15 deletions

diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index ededa28..063ea63 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -456,31 +456,29 @@ void FindBarView::ContentsChanged(views::TextField* sender,
   }
 }
 
-bool FindBarView::HandleKeystroke(views::TextField* sender, UINT message,
-                                  TCHAR key, UINT repeat_count, UINT flags) {
+bool FindBarView::HandleKeystroke(views::TextField* sender,
+                                  const views::TextField::Keystroke& key) {
   // If the dialog is not visible, there is no reason to process keyboard input.
   if (!container_->IsVisible())
     return false;
 
   // TODO(port): Handle this for other platforms.
   #if defined(OS_WIN)
-  if (container_->MaybeForwardKeystrokeToWebpage(message, key, flags))
+  if (container_->MaybeForwardKeystrokeToWebpage(key.message, key.key,
+                                                 key.flags))
     return true;  // Handled, we are done!
-  #endif
 
-  switch (key) {
-    case VK_RETURN: {
-      // Pressing Return/Enter starts the search (unless text box is empty).
-      std::wstring find_string = find_text_->GetText();
-      if (!find_string.empty()) {
-        // Search forwards for enter, backwards for shift-enter.
-        container_->GetFindBarController()->tab_contents()->StartFinding(
-            find_string,
-            GetKeyState(VK_SHIFT) >= 0);
-      }
-      break;
+  if (views::TextField::IsKeystrokeEnter(key)) {
+    // Pressing Return/Enter starts the search (unless text box is empty).
+    std::wstring find_string = find_text_->GetText();
+    if (!find_string.empty()) {
+      // Search forwards for enter, backwards for shift-enter.
+      container_->GetFindBarController()->tab_contents()->StartFinding(
+          find_string,
+          GetKeyState(VK_SHIFT) >= 0);
     }
   }
+  #endif
 
   return false;
 }