Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(483)

Unified Diff: ui/app_list/views/folder_header_view.cc

Issue 120503005: Merge NativeTextfieldViews into views::Textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix touch drag and drop unit test. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698