First cut at implementation of FindBar for views / gtk...

views/controls/textfield/textfield.h

 // Copyright (c) 2009 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.
 
 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 
+#if defined (OS_LINUX)
+#include <gdk/gdk.h>
+#endif
+
 #include "app/gfx/font.h"
 #include "base/basictypes.h"
+#include "base/keyboard_codes.h"
 #include "base/string16.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 #ifdef UNIT_TEST
 #include "base/gfx/native_widget_types.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #endif
 
 namespace views {
 
 class NativeTextfieldWrapper;
 
 // This class implements a ChromeView that wraps a native text (edit) field.
 class Textfield : public View {
  public:
   // The button's class name.
   static const char kViewClassName[];
 
   // Keystroke provides a platform-dependent way to send keystroke events.
   // Cross-platform code can use IsKeystrokeEnter/Escape to check for these
   // two common key events.
   // TODO(brettw) this should be cleaned up to be more cross-platform.
+  class Keystroke {
+   public:
 #if defined(OS_WIN)
-  struct Keystroke {
     Keystroke(unsigned int m,
               wchar_t k,
               int r,
               unsigned int f)
-        : message(m),
-          key(k),
-          repeat_count(r),
-          flags(f) {
+        : message_(m),
+          key_(k),
+          repeat_count_(r),
+          flags_(f) {
     }
+    unsigned int message() const { return message_; }
+    wchar_t key() const { return key_; }
+    int repeat_count() const { return repeat_count_; }
+    unsigned int flags() const { return flags_; }
+#else
+    explicit Keystroke(GdkEventKey* event)
+        : event_(*event) {
+    }
+    const GdkEventKey* event() const { return &event_; }
+#endif
+    base::KeyboardCode GetKeyboardCode() const;
+    bool IsControlHeld() const;
+    bool IsShiftHeld() const;
 
-    unsigned int message;
-    wchar_t key;
-    int repeat_count;
-    unsigned int flags;
+   private:
+#if defined(OS_WIN)
+    unsigned int message_;
+    wchar_t key_;
+    int repeat_count_;
+    unsigned int flags_;
+#else
+    GdkEventKey event_;
+#endif

[sky, 2009/09/09 22:49:41]

DISALLOW_COPY_AND_ASSIGN

   };
-#else
-  struct Keystroke {
-    // TODO(brettw) figure out what this should be on GTK.
-  };
-#endif
 
   // This defines the callback interface for other code to be notified of
   // changes in the state of a text field.
   class Controller {
    public:
     // This method is called whenever the text in the field changes.
     virtual void ContentsChanged(Textfield* sender,
                                  const string16& new_contents) = 0;
 
     // This method is called to get notified about keystrokes in the edit.
@@ skipping 85 matching lines @@
 
   // Calculates the insets for the text field.
   void CalculateInsets(gfx::Insets* insets);
 
   // Invoked by the edit control when the value changes. This method set
   // the text_ member variable to the value contained in edit control.
   // This is important because the edit control can be replaced if it has
   // been deleted during a window close.
   void SyncText();
 
-  // Provides a cross-platform way of checking whether a keystroke is one of
-  // these common keys. Most code only checks keystrokes against these two keys,
-  // so the caller can be cross-platform by implementing the platform-specific
-  // parts in here.
-  // TODO(brettw) we should use a more cross-platform representation of
-  // keyboard events so these are not necessary.
-  static bool IsKeystrokeEnter(const Keystroke& key);
-  static bool IsKeystrokeEscape(const Keystroke& key);
-
 #ifdef UNIT_TEST
   gfx::NativeView GetTestingHandle() const {
     return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL;
   }
 #endif
 
   // Overridden from View:
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
   virtual bool IsFocusable() const;
@@ skipping 51 matching lines @@
   // TODO(beng): remove this once NativeTextfieldWin subclasses
   //             NativeControlWin.
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_