ui/app_list/views/folder_header_view.cc - Issue 135863002: Reland Merge NativeTextfieldViews into views::Textfield.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 135863002: Reland Merge NativeTextfieldViews into views::Textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Handle Ctrl-Shift-Delete and Backspace on Linux, like on ChromeOS. 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:

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..bbdd17f1d66eb68959b0ea097da3beb9549e8eaf 100644

--- a/ui/app_list/views/folder_header_view.cc

+++ b/ui/app_list/views/folder_header_view.cc

@@ -68,11 +68,12 @@ 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));

- folder_name_view_->RemoveBorder();

+ folder_name_view_->set_border(NULL);

folder_name_view_->SetBackgroundColor(kContentsBackgroundColor);

folder_name_view_->SetController(this);

AddChildView(folder_name_view_);