summaryrefslogtreecommitdiffstats
path: root/ash/system/tray
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 22:21:21 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-26 22:21:21 +0000
commit64dd7528390cfa04d8992714480358c056b508e9 (patch)
tree93dea60b60a13af50164bed4623892b2af776938 /ash/system/tray
parentcb226a73c79224262f385c0662157d47589622f9 (diff)
downloadchromium_src-64dd7528390cfa04d8992714480358c056b508e9.zip
chromium_src-64dd7528390cfa04d8992714480358c056b508e9.tar.gz
chromium_src-64dd7528390cfa04d8992714480358c056b508e9.tar.bz2
ash: Some color adjustments for the uber-tray.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9863004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/tray')
-rw-r--r--ash/system/tray/system_tray.cc4
-rw-r--r--ash/system/tray/tray_constants.cc8
2 files changed, 6 insertions, 6 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 08a7361..f539f50 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -170,8 +170,8 @@ class SystemTrayBubbleBackground : public views::Background {
views::View* v = owner_->child_at(i);
if (!v->border()) {
- canvas->DrawLine(gfx::Point(v->x() - 1, v->y() - 1),
- gfx::Point(v->x() + v->width() + 1, v->y() - 1),
+ canvas->DrawLine(gfx::Point(v->x(), v->y() - 1),
+ gfx::Point(v->x() + v->width(), v->y() - 1),
!last_view || last_view->border() ? kBorderDarkColor :
kBorderLightColor);
canvas->DrawLine(gfx::Point(v->x() - 1, v->y() - 1),
diff --git a/ash/system/tray/tray_constants.cc b/ash/system/tray/tray_constants.cc
index 24584ca..eb239c1 100644
--- a/ash/system/tray/tray_constants.cc
+++ b/ash/system/tray/tray_constants.cc
@@ -16,11 +16,11 @@ const int kTrayPopupPaddingBetweenItems = 10;
const int kTrayPopupItemHeight = 48;
const int kTrayPopupDetailsIconWidth = 27;
-const SkColor kBackgroundColor = SK_ColorWHITE;
-const SkColor kHoverBackgroundColor = SkColorSetRGB(0xfb, 0xfc, 0xfb);
+const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
+const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5);
-const SkColor kBorderDarkColor = SkColorSetRGB(120, 120, 120);
-const SkColor kBorderLightColor = SkColorSetRGB(240, 240, 240);
+const SkColor kBorderDarkColor = SkColorSetARGB(51, 0, 0, 0);
+const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb);
const int kTrayPopupWidth = 300;