Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/find_bar_view.cc

 // Copyright (c) 2012 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/ui/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 154 matching lines @@
 }
 
 void FindBarView::SetFindTextAndSelectedRange(
     const base::string16& find_text,
     const gfx::Range& selected_range) {
   find_text_->SetText(find_text);
   find_text_->SelectRange(selected_range);
 }
 
 base::string16 FindBarView::GetFindText() const {
-  return find_text_->text();
+  return find_text_->GetText();
 }
 
 gfx::Range FindBarView::GetSelectedRange() const {
   return find_text_->GetSelectedRange();
 }
 
 base::string16 FindBarView::GetFindSelectedText() const {
   return find_text_->GetSelectedText();
 }
 
 base::string16 FindBarView::GetMatchCountText() const {
   return match_count_text_->text();
 }
 
 void FindBarView::UpdateForResult(const FindNotificationDetails& result,
                                   const base::string16& find_text) {
   bool have_valid_range =
       result.number_of_matches() != -1 && result.active_match_ordinal() != -1;
 
   // http://crbug.com/34970: some IMEs get confused if we change the text
   // composed by them. To avoid this problem, we should check the IME status and
   // update the text only when the IME is not composing text.
-  if (find_text_->text() != find_text && !find_text_->IsIMEComposing()) {
+  if (find_text_->GetText() != find_text && !find_text_->IsIMEComposing()) {
     find_text_->SetText(find_text);
     find_text_->SelectAll(true);
   }
 
   if (find_text.empty() || !have_valid_range) {
     // If there was no text entered, we don't show anything in the result count
     // area.
     ClearMatchCount();
     return;
   }
@@ skipping 14 matching lines @@
 
 void FindBarView::ClearMatchCount() {
   match_count_text_->SetText(base::string16());
   UpdateMatchCountAppearance(false);
   Layout();
   SchedulePaint();
 }
 
 void FindBarView::SetFocusAndSelection(bool select_all) {
   find_text_->RequestFocus();
-  if (select_all && !find_text_->text().empty())
+  if (select_all && !find_text_->GetText().empty())
     find_text_->SelectAll(true);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::View overrides:
 
 void FindBarView::OnPaint(gfx::Canvas* canvas) {
   // Paint drop down bar border and background.
   DropdownBarView::OnPaint(canvas);
 
@@ skipping 118 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::ButtonListener implementation:
 
 void FindBarView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   switch (sender->tag()) {
     case FIND_PREVIOUS_TAG:
     case FIND_NEXT_TAG:
-      if (!find_text_->text().empty()) {
+      if (!find_text_->GetText().empty()) {
         FindTabHelper* find_tab_helper = FindTabHelper::FromWebContents(
             find_bar_host()->GetFindBarController()->web_contents());
-        find_tab_helper->StartFinding(find_text_->text(),
+        find_tab_helper->StartFinding(find_text_->GetText(),
                                       sender->tag() == FIND_NEXT_TAG,
                                       false);  // Not case sensitive.
       }
       if (event.IsMouseEvent()) {
         // If mouse event, we move the focus back to the text-field, so that the
         // user doesn't have to click on the text field to change the search. We
         // don't want to do this for keyboard clicks on the button, since the
         // user is more likely to press FindNext again than change the search
         // query.
         find_text_->RequestFocus();
@@ skipping 17 matching lines @@
                                  const ui::KeyEvent& key_event) {
   // If the dialog is not visible, there is no reason to process keyboard input.
   if (!host()->IsVisible())
     return false;
 
   if (find_bar_host()->MaybeForwardKeyEventToWebpage(key_event))
     return true;  // Handled, we are done!
 
   if (key_event.key_code() == ui::VKEY_RETURN) {
     // Pressing Return/Enter starts the search (unless text box is empty).
-    base::string16 find_string = find_text_->text();
+    base::string16 find_string = find_text_->GetText();
     if (!find_string.empty()) {
       FindBarController* controller = find_bar_host()->GetFindBarController();
       FindTabHelper* find_tab_helper =
           FindTabHelper::FromWebContents(controller->web_contents());
       // Search forwards for enter, backwards for shift-enter.
       find_tab_helper->StartFinding(find_string,
                                     !key_event.IsShiftDown(),
                                     false);  // Not case sensitive.
     }
     return true;
   }
 
   return false;
 }
 
 void FindBarView::OnAfterUserAction(views::Textfield* sender) {
   // The composition text wouldn't be what the user is really looking for.
   // We delay the search until the user commits the composition text.
-  if (!sender->IsIMEComposing() && sender->text() != last_searched_text_)
-    Find(sender->text());
+  if (!sender->IsIMEComposing() && sender->GetText() != last_searched_text_)
+    Find(sender->GetText());
 }
 
 void FindBarView::OnAfterPaste() {
   // Clear the last search text so we always search for the user input after
   // a paste operation, even if the pasted text is the same as before.
   // See http://crbug.com/79002
   last_searched_text_.clear();
 }
 
 void FindBarView::Find(const base::string16& search_text) {
@@ skipping 55 matching lines @@
 
 void FindBarView::OnThemeChanged() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
         rb.GetImageSkiaNamed(IDR_CLOSE_1),
         rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }