| Index: ui/app_list/views/folder_header_view.cc
|
| diff --git a/ui/app_list/views/folder_header_view.cc b/ui/app_list/views/folder_header_view.cc
|
| index 302514d76d1becadd277a6809b3b7ba24c6d7cfd..8e3eb1e598a09e7b6fae28cb45fb4541bfa69ab2 100644
|
| --- a/ui/app_list/views/folder_header_view.cc
|
| +++ b/ui/app_list/views/folder_header_view.cc
|
| @@ -68,7 +68,8 @@ FolderHeaderView::FolderHeaderView(FolderHeaderViewDelegate* delegate)
|
| 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));
|
| @@ -146,7 +147,7 @@ void FolderHeaderView::ContentsChanged(views::Textfield* sender,
|
| return;
|
|
|
| folder_item_->RemoveObserver(this);
|
| - std::string name = base::UTF16ToUTF8(folder_name_view_->text());
|
| + std::string name = base::UTF16ToUTF8(folder_name_view_->GetText());
|
| folder_item_->SetTitleAndFullName(name, name);
|
| folder_item_->AddObserver(this);
|
| }
|
|
|