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

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

Issue 578243002: App list: Change some colours to match the new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ares-line-not-all-the-way
Patch Set: app_list_background: Fix drawing code so it can draw transparent separator. Created 6 years, 3 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
« no previous file with comments | « ui/app_list/views/app_list_background.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9ba4c7e405477840aff2f7ca1bab942644b056ae..e3c3cfc2ab704155c4be2c9767e5709694c9df1d 100644
--- a/ui/app_list/views/folder_header_view.cc
+++ b/ui/app_list/views/folder_header_view.cc
@@ -32,8 +32,6 @@ const int kBottomSeparatorPadding = 9; // Non-experimental app list only.
const int kBottomSeparatorHeight = 1;
const int kMaxFolderNameWidth = 300;
-const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
-
} // namespace
class FolderHeaderView::FolderNameView : public views::Textfield {
@@ -44,6 +42,8 @@ class FolderHeaderView::FolderNameView : public views::Textfield {
SetFocusPainter(views::Painter::CreateSolidFocusPainter(
kFocusBorderColor,
gfx::Insets(0, 0, 1, 1)));
+
+ SetTextColor(kFolderTitleColor);
}
virtual ~FolderNameView() {
@@ -75,7 +75,7 @@ FolderHeaderView::FolderHeaderView(FolderHeaderViewDelegate* delegate)
folder_name_view_->SetFontList(
rb.GetFontList(ui::ResourceBundle::MediumFont));
- folder_name_view_->set_placeholder_text_color(kHintTextColor);
+ folder_name_view_->set_placeholder_text_color(kFolderTitleHintTextColor);
folder_name_view_->set_placeholder_text(folder_name_placeholder_text_);
folder_name_view_->SetBorder(views::Border::NullBorder());
folder_name_view_->SetBackgroundColor(kContentsBackgroundColor);
« no previous file with comments | « ui/app_list/views/app_list_background.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698