summaryrefslogtreecommitdiffstats
path: root/ui/views
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-27 01:22:45 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-27 01:22:45 +0000
commit474672905d299c369952900e9484b16dc9a9b730 (patch)
tree70bc0e4456cea0baff767baaacfa819b5de230a3 /ui/views
parent9501fb49c299b726966576571513705276c54db4 (diff)
downloadchromium_src-474672905d299c369952900e9484b16dc9a9b730.zip
chromium_src-474672905d299c369952900e9484b16dc9a9b730.tar.gz
chromium_src-474672905d299c369952900e9484b16dc9a9b730.tar.bz2
WinAura: Fix task manager frame color
It was using a Chrome OS gray instead of a Windows blue. BUG=323318 TEST=manual Review URL: https://codereview.chromium.org/88553004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
-rw-r--r--ui/views/window/custom_frame_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index ba56603..838a79c 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -55,10 +55,12 @@ const int kTitleIconOffsetX = 4;
// The space between the title text and the caption buttons.
const int kTitleCaptionSpacing = 5;
-#if defined(USE_AURA)
+#if defined(OS_CHROMEOS)
+// Chrome OS uses a dark gray.
const SkColor kDefaultColorFrame = SkColorSetRGB(109, 109, 109);
const SkColor kDefaultColorFrameInactive = SkColorSetRGB(176, 176, 176);
#else
+// Windows and Linux use a blue.
const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
#endif