summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kasting <pkasting@chromium.org>2016-01-20 13:52:40 -0800
committerPeter Kasting <pkasting@chromium.org>2016-01-20 21:55:30 +0000
commit5e36709a36b90826b929187707e092407dad1c3d (patch)
treeb14a2cc3903499b2225eb3fbffcc3b59c6cbc1df
parent5fc7fc2b74e0a54694847d120f2cb091547389b0 (diff)
downloadchromium_src-5e36709a36b90826b929187707e092407dad1c3d.zip
chromium_src-5e36709a36b90826b929187707e092407dad1c3d.tar.gz
chromium_src-5e36709a36b90826b929187707e092407dad1c3d.tar.bz2
Swap MD and non-MD colors for detached bookmark bar background.
This undoes what looks like an accidental change in https://codereview.chromium.org/1526813002/ , where the old code in search_ui.cc used white for MD and #f1f1f1 for non-MD, but the new code in theme_properties.cc swapped these. Since then, kDefaultDetachedBookmarkBarBackgroundIncognito was added, which copied the white non-MD background, so this sets that to #f1f1f1 too. BUG=none TEST=none TBR=pkotwicz Review URL: https://codereview.chromium.org/1581933008 Cr-Commit-Position: refs/heads/master@{#370208} (cherry picked from commit 883acd6a5e0d3effbd7420926ee4f592e4525bf8) Review URL: https://codereview.chromium.org/1615463002 . Cr-Commit-Position: refs/branch-heads/2623@{#30} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
-rw-r--r--chrome/browser/themes/theme_properties.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc
index 55c751f..3f633df 100644
--- a/chrome/browser/themes/theme_properties.cc
+++ b/chrome/browser/themes/theme_properties.cc
@@ -51,9 +51,9 @@ const SkColor kDefaultColorToolbarIncognito[] = {
SkColorSetRGB(223, 223, 223), SkColorSetRGB(0x50, 0x50, 0x50)};
#endif // OS_MACOSX
const SkColor kDefaultDetachedBookmarkBarBackground[] = {
- SK_ColorWHITE, SkColorSetRGB(0xF1, 0xF1, 0xF1)};
+ SkColorSetRGB(0xF1, 0xF1, 0xF1), SK_ColorWHITE};
const SkColor kDefaultDetachedBookmarkBarBackgroundIncognito[] = {
- SK_ColorWHITE, SkColorSetRGB(0x32, 0x32, 0x32)};
+ SkColorSetRGB(0xF1, 0xF1, 0xF1), SkColorSetRGB(0x32, 0x32, 0x32)};
const SkColor kDefaultColorTabText = SK_ColorBLACK;