Reland Merge NativeTextfieldViews into views::Textfield.

ui/app_list/views/folder_header_view.cc

 // Copyright (c) 2013 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/folder_header_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 50 matching lines @@
       back_button_(new views::ImageButton(this)),
       folder_name_view_(new FolderNameView),
       delegate_(delegate) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   back_button_->SetImage(views::ImageButton::STATE_NORMAL,
       rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
   back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
       views::ImageButton::ALIGN_MIDDLE);
   AddChildView(back_button_);
 
-  folder_name_view_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
+  folder_name_view_->SetFontList(
+      rb.GetFontList(ui::ResourceBundle::MediumFont));
   folder_name_view_->set_placeholder_text_color(kHintTextColor);
   folder_name_view_->set_placeholder_text(
       rb.GetLocalizedString(IDS_APP_LIST_FOLDER_NAME_PLACEHOLDER));
-  folder_name_view_->RemoveBorder();
+  folder_name_view_->set_border(NULL);
   folder_name_view_->SetBackgroundColor(kContentsBackgroundColor);
   folder_name_view_->SetController(this);
   AddChildView(folder_name_view_);
 }
 
 FolderHeaderView::~FolderHeaderView() {
   if (folder_item_)
     folder_item_->RemoveObserver(this);
 }
 
@@ skipping 81 matching lines @@
 }
 
 void FolderHeaderView::ItemIsInstallingChanged() {
 }
 
 void FolderHeaderView::ItemPercentDownloadedChanged() {
 }
 
 }  // namespace app_list