Make Textfield more portable....

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"
@@ skipping 156 matching lines @@
 }
 
 void FindBarView::UpdateForResult(const FindNotificationDetails& result,
                                   const string16& find_text) {
   bool have_valid_range =
       result.number_of_matches() != -1 && result.active_match_ordinal() != -1;
 
   // If we don't have any results and something was passed in, then that means
   // someone pressed F3 while the Find box was closed. In that case we need to
   // repopulate the Find box with what was passed in.
-  std::wstring search_string = find_text_->GetText();
+  std::wstring search_string = find_text_->text();
   if (search_string.empty() && !find_text.empty()) {
     find_text_->SetText(UTF16ToWide(find_text));
     find_text_->SelectAll();
   }
 
   if (!search_string.empty() && have_valid_range) {
     match_count_text_->SetText(
         l10n_util::GetStringF(IDS_FIND_IN_PAGE_COUNT,
                               IntToWString(result.active_match_ordinal()),
                               IntToWString(result.number_of_matches())));
@@ skipping 19 matching lines @@
 
   // Make sure Find Next and Find Previous are enabled if we found any matches.
   find_previous_button_->SetEnabled(result.number_of_matches() > 0);
   find_next_button_->SetEnabled(result.number_of_matches() > 0);
 
   Layout();  // The match_count label may have increased/decreased in size.
 }
 
 void FindBarView::SetFocusAndSelection() {
   find_text_->RequestFocus();
-  if (!find_text_->GetText().empty()) {
+  if (!find_text_->text().empty()) {
     find_text_->SelectAll();
 
     find_previous_button_->SetEnabled(true);
     find_next_button_->SetEnabled(true);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::View overrides:
 
@@ skipping 163 matching lines @@
   return prefsize;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::ButtonListener implementation:
 
 void FindBarView::ButtonPressed(views::Button* sender) {
   switch (sender->tag()) {
     case FIND_PREVIOUS_TAG:
     case FIND_NEXT_TAG:
-      if (!find_text_->GetText().empty()) {
+      if (!find_text_->text().empty()) {
         container_->GetFindBarController()->tab_contents()->StartFinding(
-            WideToUTF16(find_text_->GetText()),
+            WideToUTF16(find_text_->text()),
             sender->tag() == FIND_NEXT_TAG,
             false);  // Not case sensitive.
       }
       // Move the focus back to the text-field, we don't want the button
       // focused.
       // TODO(jcampan): http://crbug.com/9867 we should not change the focus
       //                when teh button was pressed by pressing a key.
       find_text_->RequestFocus();
       break;
     case CLOSE_TAG:
@@ skipping 38 matching lines @@
     return false;
 
   // TODO(port): Handle this for other platforms.
   #if defined(OS_WIN)
   if (container_->MaybeForwardKeystrokeToWebpage(key.message, key.key,
                                                  key.flags))
     return true;  // Handled, we are done!
 
   if (views::Textfield::IsKeystrokeEnter(key)) {
     // Pressing Return/Enter starts the search (unless text box is empty).
-    std::wstring find_string = find_text_->GetText();
+    std::wstring 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,
           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;
 }