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

chrome/browser/views/find_bar_view.cc

 // Copyright (c) 2006-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.
 
 #include "chrome/browser/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/find_bar_win.h"
+#include "chrome/browser/views/find_bar_host.h"
 #include "chrome/browser/view_ids.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/label.h"
 
 // The amount of whitespace to have before the find button.
 static const int kWhiteSpaceAfterMatchCountLabel = 1;
@@ skipping 42 matching lines @@
 // The rounded edge on the left side of the Find text box.
 static const SkBitmap* kBackground_left = NULL;
 
 // The default number of average characters that the text box will be. This
 // number brings the width on a "regular fonts" system to about 300px.
 static const int kDefaultCharWidth = 43;
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, public:
 
-FindBarView::FindBarView(FindBarWin* container)
+FindBarView::FindBarView(FindBarHost* container)
     : container_(container),
       find_text_(NULL),
       match_count_text_(NULL),
       focus_forwarder_view_(NULL),
       find_previous_button_(NULL),
       find_next_button_(NULL),
       close_button_(NULL),
       animation_offset_(0) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
@@ skipping 370 matching lines @@
     UpdateForResult(controller->tab_contents()->find_result(), string16());
   }
 }
 
 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(key.message, key.key,
-                                                 key.flags))
+  if (container_->MaybeForwardKeystrokeToWebpage(key))
     return true;  // Handled, we are done!
 
-  if (views::Textfield::IsKeystrokeEnter(key)) {
+  if (key.GetKeyboardCode() == base::VKEY_RETURN) {
     // Pressing Return/Enter starts the search (unless text box is empty).
-    std::wstring find_string = find_text_->text();
+    string16 find_string = find_text_->text();
     if (!find_string.empty()) {
       // Search forwards for enter, backwards for shift-enter.
       container_->GetFindBarController()->tab_contents()->StartFinding(
           find_string,
-          GetKeyState(VK_SHIFT) >= 0,
+          key.IsShiftHeld(),
           false);  // Not case sensitive.
     }
   }
-  #endif
 
   return false;
 }
 
 void FindBarView::ResetMatchCountBackground() {
   match_count_text_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColorMatch));
   match_count_text_->SetColor(kTextColorMatchCount);
 }
 
 bool FindBarView::FocusForwarderView::OnMousePressed(
     const views::MouseEvent& event) {
   if (view_to_focus_on_mousedown_) {
     view_to_focus_on_mousedown_->ClearSelection();
     view_to_focus_on_mousedown_->RequestFocus();
   }
   return true;
 }