diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 19:25:49 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 19:26:53 +0000 |
| commit | 2325e589af680d8b1488001e2e1b915c5bfb9e69 (patch) | |
| tree | 3f58feff3d5f7a42be8fcd78182e4b1ed60f8253 | |
| parent | de79df2d201aa10700d568c1820466c3f06f20cc (diff) | |
| download | chromium_src-2325e589af680d8b1488001e2e1b915c5bfb9e69.zip chromium_src-2325e589af680d8b1488001e2e1b915c5bfb9e69.tar.gz chromium_src-2325e589af680d8b1488001e2e1b915c5bfb9e69.tar.bz2 | |
athena: Some more UI adjustments to the title bar.
. Change the text color.
. Change the default background color.
. Make the fonts normal.
. Add a 1px border at the bottom.
BUG=401569
R=mukai@chromium.org
Review URL: https://codereview.chromium.org/471503003
Cr-Commit-Position: refs/heads/master@{#289348}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289348 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | athena/activity/activity_frame_view.cc | 7 | ||||
| -rw-r--r-- | athena/content/web_activity.cc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/athena/activity/activity_frame_view.cc b/athena/activity/activity_frame_view.cc index ca2e8be..60f29c8 100644 --- a/athena/activity/activity_frame_view.cc +++ b/athena/activity/activity_frame_view.cc @@ -10,6 +10,7 @@ #include "athena/activity/public/activity_view_model.h" #include "ui/base/hit_test.h" #include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/label.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" @@ -27,9 +28,9 @@ ActivityFrameView::ActivityFrameView(views::Widget* frame, ActivityViewModel* view_model) : frame_(frame), view_model_(view_model), title_(new views::Label) { title_->SetHorizontalAlignment(gfx::ALIGN_CENTER); - const gfx::FontList& font_list = title_->font_list(); - title_->SetFontList(font_list.Derive(1, gfx::Font::BOLD)); - title_->SetEnabledColor(SK_ColorBLACK); + title_->SetEnabledColor(SkColorSetA(SK_ColorBLACK, 0xe5)); + title_->SetBorder(views::Border::CreateSolidSidedBorder(0, 0, 1, 0, + SkColorSetA(SK_ColorGRAY, 0x7f))); AddChildView(title_); UpdateWindowTitle(); } diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc index f304694..35e0d71 100644 --- a/athena/content/web_activity.cc +++ b/athena/content/web_activity.cc @@ -121,7 +121,7 @@ class WebActivityController : public AcceleratorHandler { DISALLOW_COPY_AND_ASSIGN(WebActivityController); }; -const SkColor kDefaultTitleColor = SK_ColorGRAY; +const SkColor kDefaultTitleColor = SkColorSetRGB(0xf2, 0xf2, 0xf2); const SkColor kDefaultUnavailableColor = SkColorSetRGB(0xbb, 0x77, 0x77); } // namespace |