Reland Merge NativeTextfieldViews into views::Textfield.

ui/app_list/views/search_box_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 "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 45 matching lines @@
 #if !defined(OS_CHROMEOS)
   menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);
   menu_button_->set_border(NULL);
   menu_button_->SetIcon(*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
   menu_button_->SetHoverIcon(*rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
   menu_button_->SetPushedIcon(*rb.GetImageSkiaNamed(
       IDR_APP_LIST_TOOLS_PRESSED));
   AddChildView(menu_button_);
 #endif
 
-  search_box_->RemoveBorder();
-  search_box_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
+  search_box_->set_border(NULL);
+  search_box_->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   search_box_->set_placeholder_text_color(kHintTextColor);
   search_box_->SetController(this);
   AddChildView(search_box_);
 
   ModelChanged();
 }
 
 SearchBoxView::~SearchBoxView() {
   model_->search_box()->RemoveObserver(this);
 }
@@ skipping 156 matching lines @@
 void SearchBoxView::SelectionModelChanged() {
   search_box_->SelectSelectionModel(model_->search_box()->selection_model());
 }
 
 void SearchBoxView::TextChanged() {
   search_box_->SetText(model_->search_box()->text());
   NotifyQueryChanged();
 }
 
 }  // namespace app_list