summaryrefslogtreecommitdiffstats
path: root/chrome/browser/themes/theme_service.cc
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 03:23:40 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 03:23:40 +0000
commitda2b2779e19c981a7b23f6dba17438244713e092 (patch)
tree573c25237cd3f344571fba8bb1b7773c2120808d /chrome/browser/themes/theme_service.cc
parent03017f7ef58fb13f14492f792f3d122ff7b865fd (diff)
downloadchromium_src-da2b2779e19c981a7b23f6dba17438244713e092.zip
chromium_src-da2b2779e19c981a7b23f6dba17438244713e092.tar.gz
chromium_src-da2b2779e19c981a7b23f6dba17438244713e092.tar.bz2
Aura: Use more traditional window frame, add flag for new look
Added --aura-windows to trigger new-style transparent window frames. Fixed window frame art for top border. BUG=102499 TEST=none Review URL: http://codereview.chromium.org/8423021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes/theme_service.cc')
-rw-r--r--chrome/browser/themes/theme_service.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index e0daa05..c2c8d6a 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -60,11 +60,21 @@ SkColor IncreaseLightness(SkColor color, double percent) {
}
// Default colors.
+#if defined(USE_AURA)
+// TODO(jamescook): Revert this when Aura is using its own window frame
+// implementation by default, specifically BrowserNonClientFrameViewAura.
+const SkColor kDefaultColorFrame = SkColorSetRGB(185, 185, 185);
+const SkColor kDefaultColorFrameInactive = SkColorSetRGB(201, 201, 201);
+const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139);
+const SkColor kDefaultColorFrameIncognitoInactive =
+ SkColorSetRGB(126, 139, 156);
+#else
const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139);
const SkColor kDefaultColorFrameIncognitoInactive =
SkColorSetRGB(126, 139, 156);
+#endif // USE_AURA
#if defined(OS_MACOSX)
const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
#else