Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / folder_header_view.cc

diff --git a/src/ui/app_list/views/folder_header_view.cc b/src/ui/app_list/views/folder_header_view.cc
index 9ba4c7e..71e1b77 100644 (file)
--- a/src/ui/app_list/views/folder_header_view.cc
+++ b/src/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,11 +42,12 @@ class FolderHeaderView::FolderNameView : public views::Textfield {
     SetFocusPainter(views::Painter::CreateSolidFocusPainter(
           kFocusBorderColor,
           gfx::Insets(0, 0, 1, 1)));
-  }
 
-  virtual ~FolderNameView() {
+    SetTextColor(kFolderTitleColor);
   }
 
+  ~FolderNameView() override {}
+
  private:
   DISALLOW_COPY_AND_ASSIGN(FolderNameView);
 };
@@ -75,7 +74,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);